From: Bruno Haible Date: Wed, 24 Apr 2002 18:04:31 +0000 (+0000) Subject: Regenerated for 0.11.1. X-Git-Tag: 0.11.2-branchpoint~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b685a652d386d1c27a52e31008f0e1da6e73aaad;p=thirdparty%2Fgettext.git Regenerated for 0.11.1. --- diff --git a/ABOUT-NLS b/ABOUT-NLS index 022965c6a..224f72c57 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -171,7 +171,7 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of March +matrix shows the current state of internationalization, as of April 2002. 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%. @@ -182,24 +182,26 @@ translation percentage of at least 50%. bash | [] [] [] [] | bfd | [] [] | binutils | [] [] | - bison | [] [] [] | + bison | [] [] [] [] | clisp | [] [] [] [] | cpio | [] [] [] [] | diffutils | [] [] [] [] [] [] | enscript | [] [] | error | [] [] | - fetchmail | () [] [] [] () | + fetchmail | [] () [] [] [] () | fileutils | [] [] [] [] [] | findutils | [] [] [] [] [] | - flex | [] [] [] [] | + flex | [] [] [] [] [] | gas | [] [] | - gawk | [] [] | + gawk | [] [] [] | gcal | [] [] | gcc | [] [] | gettext | [] [] [] [] [] | gnupg | [] [] [] [] [] [] | gprof | [] [] | - grep | [] [] [] [] [] [] | + gpsdrive | () () () () () | + grep | [] [] [] [] [] [] [] | + gretl | | hello | [] [] [] [] [] [] [] [] | id-utils | [] [] [] | indent | [] [] [] [] [] | @@ -216,7 +218,7 @@ translation percentage of at least 50%. nano | [] () [] [] [] [] | nano_1_0 | [] () [] [] [] [] | opcodes | [] [] [] | - parted | [] [] [] [] | + parted | [] [] [] [] [] | ptx | [] [] [] [] [] | python | | recode | [] [] [] [] [] [] | @@ -225,17 +227,18 @@ translation percentage of at least 50%. sharutils | [] [] [] [] [] [] | sketch | () [] () | soundtracker | [] [] [] | - sp | | + sp | [] | tar | [] [] [] [] [] [] | texinfo | [] [] [] [] [] | textutils | [] [] [] [] [] | - util-linux | [] [] [] [] | + util-linux | [] [] [] [] [] [] | vorbis-tools | | - wdiff | [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | + wastesedge | | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] [] | +-------------------------------------+ bg ca cs da de el en eo es et fi fr - 1 12 11 31 36 9 1 8 39 15 1 50 + 2 14 11 31 40 10 1 8 41 16 1 50 gl he hr hu id it ja ko lv nb nl nn +-------------------------------------+ @@ -246,36 +249,38 @@ translation percentage of at least 50%. bison | [] [] | clisp | [] | cpio | [] [] [] | - diffutils | [] [] [] | - enscript | [] | + diffutils | [] [] [] [] | + enscript | [] [] | error | [] | - fetchmail | | + fetchmail | [] | fileutils | [] [] [] | - findutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] | flex | [] | gas | | gawk | [] | gcal | | gcc | | - gettext | [] | - gnupg | [] [] [] | + gettext | [] [] | + gnupg | [] [] [] [] | gprof | | - grep | [] | - hello | [] [] [] [] [] [] [] [] [] [] | + gpsdrive | () () | + grep | [] [] [] [] [] [] | + gretl | | + hello | [] [] [] [] [] [] [] [] [] [] [] [] | id-utils | [] | indent | [] [] [] | jpilot | () () | - jwhois | | + jwhois | [] | kbd | | ld | | libc | [] [] [] [] | lilypond | [] [] | - lynx | [] [] | + lynx | [] [] [] | m4 | [] [] [] [] | - make | [] [] [] [] | + make | [] [] [] [] [] [] | mysecretdiary | | - nano | [] [] [] () [] () [] | - nano_1_0 | [] [] [] () [] () [] | + nano | [] [] [] () [] [] [] | + nano_1_0 | [] [] [] () [] [] | opcodes | [] | parted | [] [] [] | ptx | [] [] [] [] | @@ -287,77 +292,81 @@ translation percentage of at least 50%. sketch | () | soundtracker | [] | sp | | - tar | [] [] [] | - texinfo | [] [] | - textutils | [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] | util-linux | () [] | vorbis-tools | | - wdiff | | - wget | [] [] [] [] [] | + wastesedge | | + wdiff | [] [] | + wget | [] [] [] [] [] [] | +-------------------------------------+ gl he hr hu id it ja ko lv nb nl nn - 19 7 0 4 6 11 22 9 1 8 19 4 + 23 9 8 4 12 12 25 9 1 8 20 4 no pl pt pt_BR ru sk sl sv tr uk zh_TW +----------------------------------------+ - a2ps | () () () [] [] [] () | 8 + a2ps | () () () [] [] [] [] () | 9 bash | | 4 bfd | [] [] | 5 binutils | [] | 4 - bison | [] [] [] | 8 + bison | [] [] [] | 9 clisp | | 5 cpio | [] [] [] [] | 11 - diffutils | [] [] [] [] [] | 14 - enscript | [] [] [] | 6 + diffutils | [] [] [] [] [] [] | 16 + enscript | [] [] [] | 7 error | [] [] [] | 6 - fetchmail | () () [] | 4 - fileutils | [] [] [] [] | 12 - findutils | [] [] [] [] [] [] [] | 18 - flex | [] [] [] | 8 + fetchmail | () () [] | 6 + fileutils | [] [] [] [] [] | 13 + findutils | [] [] [] [] [] [] [] | 19 + flex | [] [] [] | 9 gas | [] | 3 - gawk | [] [] | 5 + gawk | [] [] | 6 gcal | [] [] | 4 gcc | [] | 3 - gettext | [] [] [] [] | 10 - gnupg | [] [] [] | 12 + gettext | [] [] [] [] [] [] | 13 + gnupg | [] [] [] | 13 gprof | [] [] | 4 - grep | [] [] [] | 10 - hello | [] [] [] [] [] [] [] | 25 + gpsdrive | () | 0 + grep | [] [] [] [] | 17 + gretl | | 0 + hello | [] [] [] [] [] [] [] | 27 id-utils | [] [] | 6 indent | [] [] [] [] | 12 - jpilot | () () | 3 - jwhois | () () [] | 3 + jpilot | () () [] | 4 + jwhois | () () [] [] | 5 kbd | [] [] | 4 ld | [] [] | 4 libc | [] [] [] [] [] [] | 17 lilypond | [] | 5 - lynx | [] [] [] | 9 + lynx | [] [] [] | 10 m4 | [] [] [] | 12 - make | [] [] [] [] | 12 + make | [] [] [] [] | 14 mysecretdiary | [] [] | 4 - nano | () [] [] [] [] | 14 - nano_1_0 | () [] [] [] | 13 + nano | () [] [] [] [] | 15 + nano_1_0 | () [] [] [] [] | 14 opcodes | [] [] | 6 - parted | [] [] [] | 10 + parted | [] [] [] | 11 ptx | [] [] [] [] [] [] | 15 python | | 0 recode | [] [] [] [] | 13 sed | [] [] [] [] [] [] | 21 sh-utils | [] [] [] [] [] [] [] [] [] | 22 - sharutils | [] [] [] | 12 + sharutils | [] [] [] [] | 13 sketch | [] () | 3 soundtracker | [] | 5 - sp | | 0 - tar | [] [] [] [] [] [] [] | 16 - texinfo | [] [] [] | 10 - textutils | [] [] [] [] | 11 - util-linux | [] [] [] | 8 + sp | | 1 + tar | [] [] [] [] [] [] [] | 18 + texinfo | [] [] | 10 + textutils | [] [] [] [] [] | 13 + util-linux | [] [] [] | 10 vorbis-tools | [] | 1 - wdiff | [] [] [] [] | 9 - wget | [] [] [] [] [] [] [] | 20 + wastesedge | | 0 + wdiff | [] [] [] [] | 12 + wget | [] [] [] [] [] [] [] [] | 23 +----------------------------------------+ 35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW - 55 domains 5 13 2 12 25 11 11 41 34 4 7 489 + 58 domains 5 16 2 14 27 11 11 41 36 4 9 536 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 @@ -370,7 +379,7 @@ 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 March 2002 seems to be old, you may fetch a more recent copy of + If April 2002 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'. diff --git a/aclocal.m4 b/aclocal.m4 index aec67887f..c36d82cb8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -581,7 +581,7 @@ AC_DEFUN([gt_PROG_LEX], AC_SUBST(LEX_OUTPUT_ROOT) ]) -# javacomp.m4 serial 2 (gettext-0.11.1) +# javacomp.m4 serial 3 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -615,7 +615,20 @@ AC_DEFUN([gt_JAVACOMP], popdef([AC_MSG_CHECKING])dnl changequote(,)dnl if test -n "$HAVE_GCJ_IN_PATH" \ - && gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null; then + && gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null \ + && ( + # See if libgcj.jar is well installed. + cat > conftest.java </dev/null + error=$? + rm -f conftest.java conftest.class + exit $error + ); then HAVE_GCJ=1 ac_result="gcj -C" else @@ -730,7 +743,7 @@ AC_DEFUN([gt_JAVAEXEC], AC_SUBST(HAVE_JVIEW) ]) -# isc-posix.m4 serial 1 (gettext-0.10.40) +# isc-posix.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -738,6 +751,8 @@ dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) @@ -5014,7 +5029,7 @@ AC_DEFUN([gt_PREREQ_HOSTNAME], fi ]) -# gettext.m4 serial 13 (gettext-0.11.1) +# gettext.m4 serial 14 (gettext-0.11.2) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -5158,14 +5173,13 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl Now see whether libintl exists and does not depend on libiconv. AC_TRY_LINK([#include extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) dnl Now see whether libintl exists and depends on libiconv. @@ -5173,14 +5187,13 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", LIBS="$LIBS $LIBICONV" AC_TRY_LINK([#include extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias ();], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=yes @@ -5705,7 +5718,7 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -# lib-link.m4 serial 1 (gettext-0.11) +# lib-link.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -6141,6 +6154,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` diff --git a/configure b/configure index c85c3a99a..05e8cb702 100755 --- a/configure +++ b/configure @@ -1065,7 +1065,7 @@ fi # Define the identity of the package. PACKAGE=gettext -VERSION=0.11.1 +VERSION=0.11.2 cat >> confdefs.h </dev/null | grep '^[3-9]' >/dev/null; then + && gcj --version 2>/dev/null | grep '^[3-9]' >/dev/null \ + && ( + # See if libgcj.jar is well installed. + cat > conftest.java </dev/null + error=$? + rm -f conftest.java conftest.class + exit $error + ); then HAVE_GCJ=1 ac_result="gcj -C" else @@ -1820,7 +1833,7 @@ EOF # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1824: checking for $ac_word" >&5 +echo "configure:1837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,9 +1868,9 @@ fi echo $ac_n "checking for Java virtual machine""... $ac_c" 1>&6 -echo "configure:1859: checking for Java virtual machine" >&5 +echo "configure:1872: checking for Java virtual machine" >&5 cat > conftest.$ac_ext <&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2045: checking host system type" >&5 +echo "configure:2058: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2064,7 +2077,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:2068: checking for strerror in -lcposix" >&5 +echo "configure:2081: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2072,7 +2085,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2107,13 +2120,13 @@ fi echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2111: checking for object suffix" >&5 +echo "configure:2124: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2131,12 +2144,12 @@ OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2135: checking for Cygwin environment" >&5 +echo "configure:2148: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2164,19 +2177,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2168: checking for mingw32 environment" >&5 +echo "configure:2181: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2195,7 +2208,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2199: checking for executable suffix" >&5 +echo "configure:2212: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2205,7 +2218,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2307,7 +2320,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2311: checking build system type" >&5 +echo "configure:2324: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2336,7 +2349,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2340: checking for ld used by GCC" >&5 +echo "configure:2353: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -2366,10 +2379,10 @@ echo "configure:2340: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2370: checking for GNU ld" >&5 +echo "configure:2383: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2373: checking for non-GNU ld" >&5 +echo "configure:2386: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2404,7 +2417,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2408: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2421: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2421,7 +2434,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:2425: checking for $LD option to reload object files" >&5 +echo "configure:2438: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2433,7 +2446,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2437: checking for BSD-compatible nm" >&5 +echo "configure:2450: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2471,7 +2484,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2475: checking whether ln -s works" >&5 +echo "configure:2488: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2492,7 +2505,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2496: checking how to recognise dependant libraries" >&5 +echo "configure:2509: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2685,7 +2698,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2689: checking command to parse $NM output" >&5 +echo "configure:2702: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2765,10 +2778,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:2769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:2772: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:2785: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -2819,7 +2832,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2868,17 +2881,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2872: checking for $ac_hdr" >&5 +echo "configure:2885: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2913,7 +2926,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2917: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2930: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2975,7 +2988,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2979: checking for file" >&5 +echo "configure:2992: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3046,7 +3059,7 @@ esac # 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3050: checking for $ac_word" >&5 +echo "configure:3063: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3078,7 +3091,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3082: checking for $ac_word" >&5 +echo "configure:3095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3113,7 +3126,7 @@ fi # 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3117: checking for $ac_word" >&5 +echo "configure:3130: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3145,7 +3158,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3149: checking for $ac_word" >&5 +echo "configure:3162: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3194,8 +3207,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3198 "configure"' > conftest.$ac_ext - if { (eval echo configure:3199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3211 "configure"' > conftest.$ac_ext + if { (eval echo configure:3212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -3216,7 +3229,7 @@ case $host in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3220: checking whether the C compiler needs -belf" >&5 +echo "configure:3233: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3229,14 +3242,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3356,7 +3369,7 @@ set dummy $CC compiler="$2" echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:3360: checking for objdir" >&5 +echo "configure:3373: checking for objdir" >&5 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -3383,7 +3396,7 @@ test -z "$pic_mode" && pic_mode=default # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:3387: checking for $compiler option to produce PIC" >&5 +echo "configure:3400: checking for $compiler option to produce PIC" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3548,21 +3561,21 @@ else # Check to make sure the pic_flag actually works. echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:3552: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +echo "configure:3565: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in hpux9* | hpux10* | hpux11*) @@ -3614,7 +3627,7 @@ if test -n "$lt_cv_prog_cc_shlib"; then fi echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:3618: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "configure:3631: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3622,14 +3635,14 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_prog_cc_static_works=yes else @@ -3656,7 +3669,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:3660: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:3673: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3675,7 +3688,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:3692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3704,7 +3717,7 @@ echo "$ac_t""$compiler_c_o" 1>&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:3708: checking if $compiler supports -c -o file.lo" >&5 +echo "configure:3721: checking if $compiler supports -c -o file.lo" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3715,14 +3728,14 @@ else save_objext="$ac_objext" ac_objext=lo cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3753,7 +3766,7 @@ hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:3757: checking if we can lock with hard links" >&5 +echo "configure:3770: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -3772,20 +3785,20 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:3776: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:3789: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3812,7 +3825,7 @@ fi # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:3816: checking whether the linker ($LD) supports shared libraries" >&5 +echo "configure:3829: checking whether the linker ($LD) supports shared libraries" >&5 allow_undefined_flag= no_undefined_flag= @@ -4496,7 +4509,7 @@ test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:4500: checking how to hardcode library paths into programs" >&5 +echo "configure:4513: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -4524,7 +4537,7 @@ echo "$ac_t""$hardcode_action" 1>&6 striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:4528: checking whether stripping libraries is possible" >&5 +echo "configure:4541: checking whether stripping libraries is possible" >&5 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" @@ -4538,7 +4551,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:4542: checking dynamic linker characteristics" >&5 +echo "configure:4555: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -4935,11 +4948,11 @@ test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:4939: checking if libtool supports shared libraries" >&5 +echo "configure:4952: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:4943: checking whether to build shared libraries" >&5 +echo "configure:4956: checking whether to build shared libraries" >&5 test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -4962,7 +4975,7 @@ esac echo "$ac_t""$enable_shared" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:4966: checking whether to build static libraries" >&5 +echo "configure:4979: checking whether to build static libraries" >&5 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes echo "$ac_t""$enable_static" 1>&6 @@ -5003,12 +5016,12 @@ else *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:5007: checking for shl_load" >&5 +echo "configure:5020: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -5049,7 +5062,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:5053: checking for shl_load in -ldld" >&5 +echo "configure:5066: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5057,7 +5070,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5087,12 +5100,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:5091: checking for dlopen" >&5 +echo "configure:5104: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -5133,7 +5146,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5137: checking for dlopen in -ldl" >&5 +echo "configure:5150: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5141,7 +5154,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5171,7 +5184,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:5175: checking for dlopen in -lsvld" >&5 +echo "configure:5188: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5179,7 +5192,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5209,7 +5222,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:5213: checking for dld_link in -ldld" >&5 +echo "configure:5226: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5217,7 +5230,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5284,7 +5297,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:5288: checking whether a program can dlopen itself" >&5 +echo "configure:5301: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5294,7 +5307,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -5378,7 +5391,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:5382: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:5395: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5388,7 +5401,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -5498,14 +5511,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:5502: checking whether -lc should be explicitly linked in" >&5 +echo "configure:5515: checking whether -lc should be explicitly linked in" >&5 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:5509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -5518,7 +5531,7 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:5522: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:5535: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then lt_cv_archive_cmds_need_lc=no else @@ -6109,12 +6122,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6113: checking for ANSI C header files" >&5 +echo "configure:6126: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6122,7 +6135,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6139,7 +6152,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6157,7 +6170,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6178,7 +6191,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6189,7 +6202,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6216,17 +6229,17 @@ for ac_hdr in limits.h malloc.h string.h unistd.h values.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6220: checking for $ac_hdr" >&5 +echo "configure:6233: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6253,13 +6266,13 @@ fi done echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6 -echo "configure:6257: checking for stdbool.h" >&5 +echo "configure:6270: checking for stdbool.h" >&5 if eval "test \"`echo '$''{'gt_cv_header_stdbool_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if false @@ -6276,7 +6289,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_header_stdbool_h=yes else @@ -6302,12 +6315,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6306: checking for working const" >&5 +echo "configure:6319: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6377,21 +6390,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:6381: checking for inline" >&5 +echo "configure:6394: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -6418,19 +6431,19 @@ esac echo $ac_n "checking for signed""... $ac_c" 1>&6 -echo "configure:6422: checking for signed" >&5 +echo "configure:6435: checking for signed" >&5 if eval "test \"`echo '$''{'bh_cv_c_signed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bh_cv_c_signed=yes else @@ -6452,12 +6465,12 @@ EOF echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6 -echo "configure:6456: checking whether backslash-a works in strings" >&5 +echo "configure:6469: checking whether backslash-a works in strings" >&5 if eval "test \"`echo '$''{'ac_cv_c_backslash_a'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_backslash_a=yes else @@ -6493,12 +6506,12 @@ EOF echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6 -echo "configure:6497: checking for unsigned long long" >&5 +echo "configure:6510: checking for unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <> i | ullmax / ull | ullmax % ull; ; return 0; } EOF -if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_type_unsigned_long_long=yes else @@ -6527,12 +6540,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6531: checking for off_t" >&5 +echo "configure:6544: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6560,12 +6573,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6564: checking for size_t" >&5 +echo "configure:6577: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6593,19 +6606,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:6597: checking for ptrdiff_t" >&5 +echo "configure:6610: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'am_cv_type_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:6609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -6627,12 +6640,12 @@ EOF echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:6631: checking for inttypes.h" >&5 +echo "configure:6644: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6640,7 +6653,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:6644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_inttypes_h=yes else @@ -6662,12 +6675,12 @@ EOF echo $ac_n "checking for stdint.h""... $ac_c" 1>&6 -echo "configure:6666: checking for stdint.h" >&5 +echo "configure:6679: checking for stdint.h" >&5 if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6675,7 +6688,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:6679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_stdint_h=yes else @@ -6711,12 +6724,12 @@ EOF echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6715: checking for ssize_t" >&5 +echo "configure:6728: checking for ssize_t" >&5 if eval "test \"`echo '$''{'gt_cv_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6727,7 +6740,7 @@ int main() { int x = sizeof (ssize_t *) + sizeof (ssize_t); ; return 0; } EOF -if { (eval echo configure:6731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_ssize_t=yes else @@ -6748,12 +6761,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6752: checking for pid_t" >&5 +echo "configure:6765: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6784,19 +6797,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6788: checking for working alloca.h" >&5 +echo "configure:6801: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6817,12 +6830,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6821: checking for alloca" >&5 +echo "configure:6834: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6882,12 +6895,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6886: checking whether alloca needs Cray hooks" >&5 +echo "configure:6899: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6916: checking for $ac_func" >&5 +echo "configure:6929: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6967,7 +6980,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6971: checking stack direction for C alloca" >&5 +echo "configure:6984: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6975,7 +6988,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -7016,12 +7029,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:7020: checking for vprintf" >&5 +echo "configure:7033: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -7068,12 +7081,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:7072: checking for _doprnt" >&5 +echo "configure:7085: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -7124,12 +7137,12 @@ for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \ strerror strtoul uname utime utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7128: checking for $ac_func" >&5 +echo "configure:7141: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7180,12 +7193,12 @@ for ac_func in memset stpcpy strcspn \ strcasecmp strncasecmp strpbrk strstr vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7184: checking for $ac_func" >&5 +echo "configure:7197: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7236,12 +7249,12 @@ done am_getline_needs_run_time_check=no echo $ac_n "checking for getline""... $ac_c" 1>&6 -echo "configure:7240: checking for getline" >&5 +echo "configure:7253: checking for getline" >&5 if eval "test \"`echo '$''{'ac_cv_func_getline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getline=yes" else @@ -7286,7 +7299,7 @@ fi if test $am_getline_needs_run_time_check = yes; then echo $ac_n "checking for working getline function""... $ac_c" 1>&6 -echo "configure:7290: checking for working getline function" >&5 +echo "configure:7303: checking for working getline function" >&5 if eval "test \"`echo '$''{'am_cv_func_working_getline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7295,7 +7308,7 @@ else am_cv_func_working_getline=no else cat > conftest.$ac_ext < @@ -7314,7 +7327,7 @@ else } EOF -if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then am_cv_func_working_getline=yes else @@ -7344,12 +7357,12 @@ if test $am_cv_func_working_getline != yes; then for ac_func in getdelim do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7348: checking for $ac_func" >&5 +echo "configure:7361: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7399,7 +7412,7 @@ done fi echo $ac_n "checking for working fnmatch function""... $ac_c" 1>&6 -echo "configure:7403: checking for working fnmatch function" >&5 +echo "configure:7416: checking for working fnmatch function" >&5 if eval "test \"`echo '$''{'gt_cv_func_fnmatch_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7408,7 +7421,7 @@ else gt_cv_func_fnmatch_works=no else cat > conftest.$ac_ext < @@ -7420,7 +7433,7 @@ else } EOF -if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gt_cv_func_fnmatch_works=yes else @@ -7462,17 +7475,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7466: checking for $ac_hdr" >&5 +echo "configure:7479: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7501,12 +7514,12 @@ done for ac_func in isascii iswcntrl iswprint mbsinit wcwidth do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7505: checking for $ac_func" >&5 +echo "configure:7518: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7555,19 +7568,19 @@ done echo $ac_n "checking whether mbrtowc and mbstate_t are properly declared""... $ac_c" 1>&6 -echo "configure:7559: checking whether mbrtowc and mbstate_t are properly declared" >&5 +echo "configure:7572: checking whether mbrtowc and mbstate_t are properly declared" >&5 if eval "test \"`echo '$''{'jm_cv_func_mbrtowc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { mbstate_t state; return ! (sizeof state && mbrtowc); ; return 0; } EOF -if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* jm_cv_func_mbrtowc=yes else @@ -7589,12 +7602,12 @@ EOF echo $ac_n "checking whether wcwidth is declared""... $ac_c" 1>&6 -echo "configure:7593: checking whether wcwidth is declared" >&5 +echo "configure:7606: checking whether wcwidth is declared" >&5 if eval "test \"`echo '$''{'ac_cv_have_decl_wcwidth'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <. */ @@ -7613,7 +7626,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_decl_wcwidth=yes else @@ -7641,17 +7654,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7645: checking for $ac_hdr" >&5 +echo "configure:7658: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7679,12 +7692,12 @@ done echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:7683: checking for mbstate_t" >&5 +echo "configure:7696: checking for mbstate_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_mbstate_t=yes else @@ -7720,12 +7733,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:7724: checking for $ac_hdr that defines DIR" >&5 +echo "configure:7737: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -7733,7 +7746,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7758,7 +7771,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:7762: checking for opendir in -ldir" >&5 +echo "configure:7775: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7766,7 +7779,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7799,7 +7812,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7803: checking for opendir in -lx" >&5 +echo "configure:7816: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7807,7 +7820,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7843,7 +7856,7 @@ fi echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:7847: checking whether closedir returns void" >&5 +echo "configure:7860: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7851,13 +7864,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:7861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -7883,17 +7896,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7887: checking for $ac_hdr" >&5 +echo "configure:7900: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7920,7 +7933,7 @@ fi done echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:7924: checking for long file names" >&5 +echo "configure:7937: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7966,12 +7979,12 @@ fi for ac_func in pathconf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7970: checking for $ac_func" >&5 +echo "configure:7983: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8022,17 +8035,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8026: checking for $ac_hdr" >&5 +echo "configure:8039: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8061,17 +8074,17 @@ done ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:8065: checking for vfork.h" >&5 +echo "configure:8078: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8096,18 +8109,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:8100: checking for working vfork" >&5 +echo "configure:8113: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:8106: checking for vfork" >&5 +echo "configure:8119: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -8152,7 +8165,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -8247,7 +8260,7 @@ main() { } } EOF -if { (eval echo configure:8251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -8273,12 +8286,12 @@ fi for ac_func in waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8277: checking for $ac_func" >&5 +echo "configure:8290: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8326,12 +8339,12 @@ fi done echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:8330: checking for union wait" >&5 +echo "configure:8343: checking for union wait" >&5 if eval "test \"`echo '$''{'gt_cv_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8354,7 +8367,7 @@ pid = waitpid (-1, &status, 0); ; return 0; } EOF -if { (eval echo configure:8358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_union_wait=yes else @@ -8376,12 +8389,12 @@ echo "$ac_t""$gt_cv_union_wait" 1>&6 echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:8380: checking whether stat file-mode macros are broken" >&5 +echo "configure:8393: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8434,12 +8447,12 @@ fi for ac_func in __secure_getenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8438: checking for $ac_func" >&5 +echo "configure:8451: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8491,12 +8504,12 @@ done for ac_func in mkdtemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8495: checking for $ac_func" >&5 +echo "configure:8508: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8546,12 +8559,12 @@ done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:8550: checking whether stat file-mode macros are broken" >&5 +echo "configure:8563: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8603,12 +8616,12 @@ fi echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:8607: checking for inttypes.h" >&5 +echo "configure:8620: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8616,7 +8629,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:8620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_inttypes_h=yes else @@ -8638,12 +8651,12 @@ EOF echo $ac_n "checking for stdint.h""... $ac_c" 1>&6 -echo "configure:8642: checking for stdint.h" >&5 +echo "configure:8655: checking for stdint.h" >&5 if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8651,7 +8664,7 @@ int main() { uintmax_t i = (uintmax_t) -1; ; return 0; } EOF -if { (eval echo configure:8655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jm_ac_cv_header_stdint_h=yes else @@ -8675,17 +8688,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8679: checking for $ac_hdr" >&5 +echo "configure:8692: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8714,12 +8727,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8718: checking for $ac_func" >&5 +echo "configure:8731: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8770,7 +8783,7 @@ done signals_not_posix= cat > conftest.$ac_ext < EOF @@ -8785,12 +8798,12 @@ rm -f conftest* if test -z "$signals_not_posix"; then echo $ac_n "checking for sigprocmask""... $ac_c" 1>&6 -echo "configure:8789: checking for sigprocmask" >&5 +echo "configure:8802: checking for sigprocmask" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigprocmask'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sigprocmask=yes" else @@ -8839,12 +8852,12 @@ fi echo $ac_n "checking for signal handlers with siginfo_t""... $ac_c" 1>&6 -echo "configure:8843: checking for signal handlers with siginfo_t" >&5 +echo "configure:8856: checking for signal handlers with siginfo_t" >&5 if eval "test \"`echo '$''{'gt_cv_siginfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8857,7 +8870,7 @@ action.sa_sigaction = (void *) 0; ; return 0; } EOF -if { (eval echo configure:8861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_siginfo_t=yes else @@ -8881,12 +8894,12 @@ EOF for ac_func in setenv unsetenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8885: checking for $ac_func" >&5 +echo "configure:8898: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8939,17 +8952,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8943: checking for $ac_hdr" >&5 +echo "configure:8956: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8978,12 +8991,12 @@ done for ac_func in tsearch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8982: checking for $ac_func" >&5 +echo "configure:8995: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9033,13 +9046,13 @@ done echo $ac_n "checking if errno is properly declared""... $ac_c" 1>&6 -echo "configure:9037: checking if errno is properly declared" >&5 +echo "configure:9050: checking if errno is properly declared" >&5 if eval "test \"`echo '$''{'gt_cv_var_errno_declaration'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern struct { int foo; } errno; @@ -9047,7 +9060,7 @@ int main() { errno.foo = 1; ; return 0; } EOF -if { (eval echo configure:9051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_var_errno_declaration=no else @@ -9070,13 +9083,13 @@ EOF echo $ac_n "checking if environ is properly declared""... $ac_c" 1>&6 -echo "configure:9074: checking if environ is properly declared" >&5 +echo "configure:9087: checking if environ is properly declared" >&5 if eval "test \"`echo '$''{'gt_cv_var_environ_declaration'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern struct { int foo; } environ; @@ -9084,7 +9097,7 @@ int main() { environ.foo = 1; ; return 0; } EOF -if { (eval echo configure:9088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_var_environ_declaration=no else @@ -9107,19 +9120,19 @@ EOF echo $ac_n "checking for error_at_line""... $ac_c" 1>&6 -echo "configure:9111: checking for error_at_line" >&5 +echo "configure:9124: checking for error_at_line" >&5 if eval "test \"`echo '$''{'am_cv_lib_error_at_line'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_error_at_line=yes else @@ -9144,17 +9157,17 @@ for ac_hdr in locale.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9148: checking for $ac_hdr" >&5 +echo "configure:9161: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9181,13 +9194,13 @@ fi done echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6 -echo "configure:9185: checking for setlocale declaration" >&5 +echo "configure:9198: checking for setlocale declaration" >&5 if eval "test \"`echo '$''{'gt_cv_proto_setlocale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9206,7 +9219,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_proto_setlocale_arg1="" else @@ -9233,17 +9246,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9237: checking for $ac_hdr" >&5 +echo "configure:9250: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9272,12 +9285,12 @@ done for ac_func in gethostname gethostbyname inet_ntop do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9276: checking for $ac_func" >&5 +echo "configure:9289: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9326,13 +9339,13 @@ done echo $ac_n "checking for IPv6 sockets""... $ac_c" 1>&6 -echo "configure:9330: checking for IPv6 sockets" >&5 +echo "configure:9343: checking for IPv6 sockets" >&5 if eval "test \"`echo '$''{'gt_cv_socket_ipv6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9342,7 +9355,7 @@ int main() { int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; ; return 0; } EOF -if { (eval echo configure:9346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gt_cv_socket_ipv6=yes else @@ -9382,7 +9395,7 @@ EOF echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6 -echo "configure:9386: checking for shared library run path origin" >&5 +echo "configure:9399: checking for shared library run path origin" >&5 if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9419,7 +9432,7 @@ echo "$ac_t""$acl_cv_rpath" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9423: checking for $ac_word" >&5 +echo "configure:9436: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9450,17 +9463,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9454: checking for $ac_hdr" >&5 +echo "configure:9467: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9489,12 +9502,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9493: checking for $ac_func" >&5 +echo "configure:9506: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9542,7 +9555,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:9546: checking for working mmap" >&5 +echo "configure:9559: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9550,7 +9563,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -9714,12 +9727,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:9718: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:9731: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10059,6 +10072,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; @@ -10134,7 +10170,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:10138: checking for iconv" >&5 +echo "configure:10174: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10142,7 +10178,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -10152,7 +10188,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:10156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -10164,7 +10200,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat > conftest.$ac_ext < #include @@ -10174,7 +10210,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:10178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -10197,7 +10233,7 @@ EOF fi if test "$am_cv_lib_iconv" = yes; then echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6 -echo "configure:10201: checking how to link with libiconv" >&5 +echo "configure:10237: checking how to link with libiconv" >&5 echo "$ac_t""$LIBICONV" 1>&6 else CPPFLAGS="$am_save_CPPFLAGS" @@ -10213,7 +10249,7 @@ echo "configure:10201: checking how to link with libiconv" >&5 # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10217: checking for $ac_word" >&5 +echo "configure:10253: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10248,7 +10284,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10252: checking for $ac_word" >&5 +echo "configure:10288: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10285,7 +10321,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10289: checking for $ac_word" >&5 +echo "configure:10325: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10322,7 +10358,7 @@ fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10326: checking for $ac_word" >&5 +echo "configure:10362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10385,17 +10421,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10389: checking for $ac_hdr" >&5 +echo "configure:10425: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10426,12 +10462,12 @@ geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10430: checking for $ac_func" >&5 +echo "configure:10466: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10483,13 +10519,13 @@ done if test "$am_cv_func_iconv" = yes; then echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:10487: checking for iconv declaration" >&5 +echo "configure:10523: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10508,7 +10544,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -10532,19 +10568,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:10536: checking for nl_langinfo and CODESET" >&5 +echo "configure:10572: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:10548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -10567,19 +10603,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:10571: checking for LC_MESSAGES" >&5 +echo "configure:10607: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:10583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -10605,7 +10641,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10609: checking for $ac_word" >&5 +echo "configure:10645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10638,7 +10674,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:10642: checking version of bison" >&5 +echo "configure:10678: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -10665,7 +10701,7 @@ echo "configure:10642: checking version of bison" >&5 echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:10669: checking whether NLS is requested" >&5 +echo "configure:10705: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -10689,7 +10725,7 @@ fi gt_use_preinstalled_gnugettext=no echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:10693: checking whether included gettext is requested" >&5 +echo "configure:10729: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -10709,12 +10745,12 @@ fi echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:10713: checking for GNU gettext in libc" >&5 +echo "configure:10749: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -10724,7 +10760,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } EOF -if { (eval echo configure:10728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libc=yes else @@ -11045,6 +11081,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; @@ -11094,7 +11153,7 @@ fi fi echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:11098: checking for GNU gettext in libintl" >&5 +echo "configure:11157: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11103,11 +11162,10 @@ else gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" @@ -11115,10 +11173,10 @@ extern const char *_nl_expand_alias (); int main() { bindtextdomain ("", ""); -return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } EOF -if { (eval echo configure:11122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext2_libintl=yes else @@ -11131,11 +11189,10 @@ rm -f conftest* if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; extern #ifdef __cplusplus "C" @@ -11143,10 +11200,10 @@ extern const char *_nl_expand_alias (); int main() { bindtextdomain ("", ""); -return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } EOF -if { (eval echo configure:11150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" @@ -11212,7 +11269,7 @@ EOF if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6 -echo "configure:11216: checking how to link with libintl" >&5 +echo "configure:11273: checking how to link with libintl" >&5 echo "$ac_t""$LIBINTL" 1>&6 for element in $INCINTL; do @@ -11609,6 +11666,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; @@ -11684,7 +11764,7 @@ fi echo $ac_n "checking for libexpat""... $ac_c" 1>&6 -echo "configure:11688: checking for libexpat" >&5 +echo "configure:11768: checking for libexpat" >&5 if eval "test \"`echo '$''{'ac_cv_libexpat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11692,14 +11772,14 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS $LIBEXPAT" cat > conftest.$ac_ext < int main() { XML_ExpatVersion(); ; return 0; } EOF -if { (eval echo configure:11703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_libexpat=yes else @@ -11721,7 +11801,7 @@ echo "$ac_t""$ac_cv_libexpat" 1>&6 EOF echo $ac_n "checking how to link with libexpat""... $ac_c" 1>&6 -echo "configure:11725: checking how to link with libexpat" >&5 +echo "configure:11805: checking how to link with libexpat" >&5 echo "$ac_t""$LIBEXPAT" 1>&6 else HAVE_LIBEXPAT=no @@ -11743,7 +11823,7 @@ if test "${with_lispdir+set}" = set; then withval="$with_lispdir" lispdir="$withval" echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:11747: checking where .elc files should go" >&5 +echo "configure:11827: checking where .elc files should go" >&5 echo "$ac_t""$lispdir" 1>&6 else @@ -11755,7 +11835,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11759: checking for $ac_word" >&5 +echo "configure:11839: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11788,7 +11868,7 @@ test -n "$EMACS" || EMACS="no" if test $EMACS != "no"; then if test x${lispdir+set} != xset; then echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6 -echo "configure:11792: checking where .elc files should go" >&5 +echo "configure:11872: checking where .elc files should go" >&5 if eval "test \"`echo '$''{'am_cv_lispdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11815,7 +11895,7 @@ ac_aux_dir_abs=`cd $ac_aux_dir && pwd` # Extract the first word of "dvips", so it can be a program name with args. set dummy dvips; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11819: checking for $ac_word" >&5 +echo "configure:11899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11851,7 +11931,7 @@ fi # Extract the first word of "texi2pdf", so it can be a program name with args. set dummy texi2pdf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11855: checking for $ac_word" >&5 +echo "configure:11935: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEXI2PDF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11887,7 +11967,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11891: checking for $ac_word" >&5 +echo "configure:11971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11929,7 +12009,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11933: checking for $ac_word" >&5 +echo "configure:12013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11961,7 +12041,7 @@ test -n "$CXX" || CXX=":" if test "$CXX" != ":"; then echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:11965: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:12045: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -11972,12 +12052,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 11976 "configure" +#line 12056 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:11981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then diff --git a/doc/gettext.info b/doc/gettext.info index 8c3de9e63..20dbbd2b9 100644 --- a/doc/gettext.info +++ b/doc/gettext.info @@ -33,166 +33,167 @@ translation approved by the Foundation.  Indirect: gettext.info-1: 1417 -gettext.info-2: 47468 -gettext.info-3: 93845 -gettext.info-4: 142783 -gettext.info-5: 192140 -gettext.info-6: 241816 -gettext.info-7: 291614 -gettext.info-8: 340947 -gettext.info-9: 376830 +gettext.info-2: 47531 +gettext.info-3: 91847 +gettext.info-4: 138115 +gettext.info-5: 183718 +gettext.info-6: 231593 +gettext.info-7: 278589 +gettext.info-8: 328144 +gettext.info-9: 378100  Tag Table: (Indirect) Node: Top1417 -Node: Introduction10502 -Node: Why12360 -Ref: Why-Footnote-115467 -Node: Concepts15623 -Node: Aspects19036 -Node: Files24874 -Node: Overview26775 -Node: Basics37569 -Node: Installation38399 -Node: PO Files40341 -Ref: PO Files-Footnote-147341 -Node: Main PO Commands47468 -Node: Entry Positioning52538 -Node: Normalizing57992 -Node: Sources62445 -Node: Triggering63715 -Node: Mark Keywords66742 -Node: Marking70290 -Node: c-format78006 -Node: Special cases81908 -Node: Template84636 -Node: xgettext Invocation84988 -Node: Creating91334 -Node: msginit Invocation92225 -Node: Header Entry93845 -Node: Updating100002 -Node: msgmerge Invocation100757 -Node: Translated Entries104609 -Node: Fuzzy Entries105963 -Node: Untranslated Entries109133 -Node: Obsolete Entries111053 -Node: Modifying Translations114266 -Node: Modifying Comments122223 -Node: Subedit126636 -Node: C Sources Context130518 -Node: Auxiliary135621 -Node: Compendium138846 -Node: Creating Compendia139456 -Node: Using Compendia141895 -Node: Manipulating142783 -Node: msgcat Invocation146263 -Node: msgconv Invocation149492 -Node: msggrep Invocation151652 -Node: msgfilter Invocation155333 -Node: msguniq Invocation159181 -Node: msgcomm Invocation162051 -Node: msgcmp Invocation165075 -Node: msgattrib Invocation166305 -Node: msgen Invocation169420 -Node: msgexec Invocation171770 -Node: Binaries173821 -Node: msgfmt Invocation174153 -Node: msgunfmt Invocation179885 -Node: MO Files182566 -Node: Users190657 -Node: Matrix192140 -Node: Installers193344 -Node: End Users194514 -Node: Programmers195163 -Node: catgets196336 -Node: Interface to catgets197739 -Node: Problems with catgets199743 -Node: gettext200644 -Node: Interface to gettext202102 -Node: Ambiguities204441 -Node: Locating Catalogs207134 -Ref: Locating Catalogs-Footnote-1208281 -Ref: Locating Catalogs-Footnote-2208506 -Node: Charset conversion208655 -Node: Plural forms211097 -Ref: Plural forms-Footnote-1221690 -Node: GUI program problems221782 -Node: Optimized gettext226886 -Node: Comparison228219 -Node: Using libintl.a232489 -Node: gettext grok232922 -Node: Temp Programmers235467 -Node: Temp Implementations235907 -Node: Temp catgets237273 -Node: Temp WSI238960 -Node: Temp Notes240948 -Node: Translators241437 -Node: Trans Intro 0241816 -Node: Trans Intro 1244465 -Node: Discussions246329 -Node: Organization249831 -Node: Central Coordination251812 -Node: National Teams252940 -Node: Sub-Cultures255452 -Node: Organizational Ideas256371 -Node: Mailing Lists257374 -Node: Information Flow259177 -Node: Maintainers261310 -Node: Flat and Non-Flat263154 -Node: Prerequisites264637 -Node: gettextize Invocation268778 -Node: Adjusting Files273226 -Node: po/POTFILES.in274830 -Node: po/LINGUAS275772 -Node: po/Makevars276554 -Node: configure.in278140 -Node: config.guess280230 -Node: aclocal281340 -Node: acconfig282865 -Node: Makefile283348 -Node: src/Makefile285926 -Node: lib/gettext.h288909 -Node: autoconf macros291134 -Node: AM_GNU_GETTEXT291614 -Node: AM_ICONV294916 -Node: Programming Languages297102 -Node: Language Implementors297923 -Node: Programmers for other Languages302744 -Node: Translators for other Languages303310 -Node: Maintainers for other Languages303747 -Node: List of Programming Languages304974 -Node: C306097 -Node: sh307078 -Node: bash307704 -Node: Python308389 -Node: Common Lisp309451 -Node: clisp C310165 -Node: Emacs Lisp310887 -Node: librep311593 -Node: Smalltalk312244 -Node: Java313317 -Node: gawk315987 -Node: Pascal316814 -Node: wxWindows318030 -Node: YCP318764 -Node: Tcl319423 -Node: Perl320726 -Node: PHP321344 -Node: Pike322047 -Node: List of Data Formats322673 -Node: POT323132 -Node: RST323376 -Node: Glade323588 -Node: Conclusion323866 -Node: History324366 -Node: References328468 -Node: Language Codes330023 -Node: Country Codes333926 -Node: Program Index339646 -Node: Option Index340947 -Node: Variable Index366112 -Node: PO Mode Index367214 -Node: Autoconf Macro Index376572 -Node: Index376830 +Node: Introduction10565 +Node: Why12423 +Ref: Why-Footnote-115530 +Node: Concepts15686 +Node: Aspects19099 +Node: Files24937 +Node: Overview26838 +Node: Basics37632 +Node: Installation38462 +Node: PO Files40404 +Ref: PO Files-Footnote-147404 +Node: Main PO Commands47531 +Node: Entry Positioning52601 +Node: Normalizing58055 +Node: Sources62508 +Node: Triggering63841 +Node: Preparing Strings66872 +Node: Mark Keywords73594 +Node: Marking77149 +Node: c-format84865 +Node: Special cases88767 +Node: Template91495 +Node: xgettext Invocation91847 +Node: Creating98439 +Node: msginit Invocation99330 +Node: Header Entry101196 +Node: Updating107353 +Node: msgmerge Invocation108108 +Node: Translated Entries112206 +Node: Fuzzy Entries113560 +Node: Untranslated Entries116730 +Node: Obsolete Entries118650 +Node: Modifying Translations121863 +Node: Modifying Comments129820 +Node: Subedit134233 +Node: C Sources Context138115 +Node: Auxiliary143218 +Node: Compendium146443 +Node: Creating Compendia147053 +Node: Using Compendia149492 +Node: Manipulating150380 +Node: msgcat Invocation153860 +Node: msgconv Invocation157335 +Node: msggrep Invocation159741 +Node: msgfilter Invocation163668 +Node: msguniq Invocation167762 +Node: msgcomm Invocation170878 +Node: msgcmp Invocation174148 +Node: msgattrib Invocation175378 +Node: msgen Invocation178739 +Node: msgexec Invocation181335 +Node: Binaries183386 +Node: msgfmt Invocation183718 +Node: msgunfmt Invocation189450 +Node: MO Files192377 +Node: Users200468 +Node: Matrix201951 +Node: Installers203155 +Node: End Users204325 +Node: Programmers204974 +Node: catgets206147 +Node: Interface to catgets207550 +Node: Problems with catgets209554 +Node: gettext210455 +Node: Interface to gettext211913 +Node: Ambiguities214252 +Node: Locating Catalogs216945 +Ref: Locating Catalogs-Footnote-1218092 +Ref: Locating Catalogs-Footnote-2218317 +Node: Charset conversion218466 +Node: Plural forms220908 +Ref: Plural forms-Footnote-1231501 +Node: GUI program problems231593 +Node: Optimized gettext236697 +Node: Comparison238030 +Node: Using libintl.a242300 +Node: gettext grok242733 +Node: Temp Programmers245278 +Node: Temp Implementations245718 +Node: Temp catgets247084 +Node: Temp WSI248771 +Node: Temp Notes250759 +Node: Translators251248 +Node: Trans Intro 0251627 +Node: Trans Intro 1254276 +Node: Discussions256140 +Node: Organization259642 +Node: Central Coordination261623 +Node: National Teams262751 +Node: Sub-Cultures265263 +Node: Organizational Ideas266182 +Node: Mailing Lists267185 +Node: Information Flow268988 +Node: Maintainers271121 +Node: Flat and Non-Flat272965 +Node: Prerequisites274448 +Node: gettextize Invocation278589 +Node: Adjusting Files283037 +Node: po/POTFILES.in284641 +Node: po/LINGUAS285886 +Node: po/Makevars286668 +Node: configure.in288254 +Node: config.guess290344 +Node: aclocal291454 +Node: acconfig292979 +Node: Makefile293462 +Node: src/Makefile296040 +Node: lib/gettext.h299023 +Node: autoconf macros301248 +Node: AM_GNU_GETTEXT301728 +Node: AM_ICONV305030 +Node: Programming Languages307216 +Node: Language Implementors308037 +Node: Programmers for other Languages312858 +Node: Translators for other Languages313424 +Node: Maintainers for other Languages313861 +Node: List of Programming Languages315088 +Node: C316211 +Node: sh317192 +Node: bash317818 +Node: Python318503 +Node: Common Lisp319565 +Node: clisp C320279 +Node: Emacs Lisp321001 +Node: librep321707 +Node: Smalltalk322358 +Node: Java323431 +Node: gawk326101 +Node: Pascal326928 +Node: wxWindows328144 +Node: YCP328878 +Node: Tcl329537 +Node: Perl330840 +Node: PHP331458 +Node: Pike332161 +Node: List of Data Formats332787 +Node: POT333246 +Node: RST333490 +Node: Glade333702 +Node: Conclusion333980 +Node: History334480 +Node: References338582 +Node: Language Codes340137 +Node: Country Codes344076 +Node: Program Index349796 +Node: Option Index351097 +Node: Variable Index376998 +Node: PO Mode Index378100 +Node: Autoconf Macro Index387458 +Node: Index387716  End Tag Table diff --git a/doc/gettext.info-1 b/doc/gettext.info-1 index 13e9c918e..0c5aa094c 100644 --- a/doc/gettext.info-1 +++ b/doc/gettext.info-1 @@ -84,6 +84,7 @@ PO Files and PO Mode Basics Preparing Program Sources * Triggering:: Triggering `gettext' Operations +* Preparing Strings:: Preparing Translatable Strings * Mark Keywords:: How Marks Appear in Sources * Marking:: Marking Translatable Strings * c-format:: Telling something about the following string diff --git a/doc/gettext.info-2 b/doc/gettext.info-2 index 9cbd92ae7..1c4c89379 100644 --- a/doc/gettext.info-2 +++ b/doc/gettext.info-2 @@ -374,13 +374,14 @@ sections of this chapter. * Menu: * Triggering:: Triggering `gettext' Operations +* Preparing Strings:: Preparing Translatable Strings * Mark Keywords:: How Marks Appear in Sources * Marking:: Marking Translatable Strings * c-format:: Telling something about the following string * Special cases:: Special Cases of Translatable Strings  -File: gettext.info, Node: Triggering, Next: Mark Keywords, Prev: Sources, Up: Sources +File: gettext.info, Node: Triggering, Next: Preparing Strings, Prev: Sources, Up: Sources Triggering `gettext' Operations =============================== @@ -453,7 +454,174 @@ large program's source, and because switching a locale is not multithread-safe.  -File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Triggering, Up: Sources +File: gettext.info, Node: Preparing Strings, Next: Mark Keywords, Prev: Triggering, Up: Sources + +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 +next sections. What you have to keep in mind while doing that is the +following. + + * Decent English style. + + * Entire sentences. + + * Split at paragraphs. + + * Use format strings instead of string concatenation. + +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. + + "%s: is parameter\n" + +This is nearly untranslatable: Is the displayed item _a_ parameter or +_the_ parameter? + + "No match" + +The ambiguity in this message makes it ununderstandable: Is the program +attempting to set something on fire? Does it mean "The given object does +not match the template"? Does it mean "The template does not fit for any +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. + + printf ("File %s is %s protected", filename, rw ? "write" : "read"); + +Most translators will not look at the source and will thus only see the +string `"File %s is %s protected"', which is unintelligible. Change +this to + + printf (rw ? "File %s is write protected" : "File %s is read protected", + filename); + +This way the translator will not only understand the message, she will +also be able to find the appropriate grammatical construction. The +French translator for example translates "write protected" like +"protected against writing". + + Often sentences don't fit into a single line. If a sentence is output +using two subsequent `printf' statements, like this + + printf ("Locale charset \"%s\" is different from\n", lcharset); + printf ("input file charset \"%s\".\n", fcharset); + +the translator would have to translate two half sentences, but nothing +in the POT file would tell her that the two half sentences belong +together. It is necessary to merge the two `printf' statements so that +the translator can handle the entire sentence at once and decide at +which place to insert a line break in the translation (if at all): + + printf ("Locale charset \"%s\" is different from\n\ + input file charset \"%s\".\n", lcharset, fcharset); + + You may now ask: how about two or more adjacent sentences? Like in +this case: + + puts ("Apollo 13 scenario: Stack overflow handling failed."); + puts ("On the next stack overflow we will crash!!!"); + +Should these two statements merged into a single one? I would recommend +to merge them if the two sentences are related to each other, because +then it makes it easier for the translator to understand and translate +both. On the other hand, if one of the two messages is a stereotypic +one, occurring in other places as well, you will do a favour to the +translator by not merging the two. (Identical messages occurring in +several places are 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 +updating the entire translated string. Maybe only a single word will +have changed in the English string, but the translator doesn't see that +(with the current translation tools), therefore she has to proofread +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, +you can also attempt to split the documented options into groups, such +as the input options, the output options, and the informative output +options. This will help every user to find the option he is looking for. + + Hardcoded string concatenation is sometimes used to construct English +strings: + + strcpy (s, "Replace "); + strcat (s, object1); + strcat (s, " with "); + strcat (s, object2); + strcat (s, "?"); + +In order to present to the translator only entire sentences, and also +because in some languages the translator might want to swap the order +of `object1' and `object2', it is necessary to change this to use a +format string: + + sprintf (s, "Replace %s with %s?", object1, object2); + + A similar case is compile time concatenation of strings. The ISO C 99 +include file `' contains a macro `PRId64' that can be used +as a formatting directive for outputting an `int64_t' integer through +`printf'. It expands to a constant string, usually "d" or "ld" or "lld" +or something like this, depending on the platform. Assume you have +code like + + printf ("The amount is %0" PRId64 "\n"), number); + +After marking, this cannot become + + printf (gettext ("The amount is %0") PRId64 "\n"), number); + +because it would simply be invalid C syntax. It cannot become + + printf (gettext ("The amount is %0" PRId64 "\n")), number); + +because the value of `PRId64' is not known to `xgettext', and even if +were, there would be three or more possibilities, and the translator +would have to translate three or more strings that differ in a single +letter. + + The solution for this problem is to change the code like this: + + char buf1[100]; + sprintf (buf1, "%0" PRId64, number); + printf (gettext ("The amount is %s\n"), buf1); + + This means, you put the platform dependent code in one statement, +and the internationalization code in a different statement. Note that a +buffer length of 100 is safe, because all available hardware integer +types are limited to 128 bits, and to print a 128 bit integer one needs +at most 54 characters, regardless whether in decimal, octal or +hexadecimal. + + All this applies to other programming languages as well. For +example, in Java, string contenation is very frequently used, because +it is a compiler built-in operator. Like in C, in Java, you would change + + System.out.println("Replace "+object1+" with "+object2+"?"); + +into a statement involving a format string: + + System.out.println( + MessageFormat.format("Replace {0} with {1}?", + new Object[] { object1, object2 })); + + +File: gettext.info, Node: Mark Keywords, Next: Marking, Prev: Preparing Strings, Up: Sources How Marks Appear in Sources =========================== @@ -839,306 +1007,3 @@ file. This section explains how to use `xgettext' for this purpose. * xgettext Invocation:: Invoking the `xgettext' Program - -File: gettext.info, Node: xgettext Invocation, Prev: Template, Up: Template - -Invoking the `xgettext' Program -=============================== - - xgettext [OPTION] [INPUTFILE] ... - - The `xgettext' program extracts translatable strings from given -input files. - -Input file location -------------------- - -`INPUTFILE ...' - Input files. - -`-f FILE' -`--files-from=FILE' - Read the names of the input files from FILE instead of getting - them from the command line. - -`-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. - - If INPUTFILE is `-', standard input is read. - -Output file location --------------------- - -`-d NAME' -`--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'). - -`-p DIR' -`--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. - -Choice of input file language ------------------------------ - -`-L NAME' -`--language=NAME' - Specifies the language of the input files. The supported languages - are `C', `C++', `ObjectiveC', `PO', `Python', `Lisp', `EmacsLisp', - `librep', `Java', `awk', `YCP', `Tcl', `RST', `Glade'. - -`-C' -`--c++' - This is a shorthand for `--language=C++'. - - By default the language is guessed depending on the input file name -extension. - -Operation mode --------------- - -`-j' -`--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. - -`-c [TAG]' -`--add-comments[=TAG]' - Place comment block with TAG (or those preceding keyword lines) in - output file. - -Language=C/C++ specific options -------------------------------- - -`-a' -`--extract-all' - Extract all strings. - -`-k KEYWORDSPEC' -`--keyword[=KEYWORDSPEC]' - Additional keyword to be looked for (without KEYWORDSPEC means not - to use default keywords). - - If KEYWORDSPEC is a C identifer ID, `xgettext' looks for strings - in the first argument of each call to the function or macro ID. - If KEYWORDSPEC is of the form `ID:ARGNUM', `xgettext' looks for - strings in the ARGNUMth argument of the call. If KEYWORDSPEC is - of the form `ID:ARGNUM1,ARGNUM2', `xgettext' looks for strings in - the ARGNUM1st argument and in the ARGNUM2nd argument of the call, - and treats them as singular/plural variants for a message with - plural handling. - - The default keyword specifications, which are always looked for if - not explicitly disabled, are `gettext', `dgettext:2', - `dcgettext:2', `ngettext:1,2', `dngettext:2,3', `dcngettext:2,3', - and `gettext_noop'. - -`-T' -`--trigraphs' - Understand ANSI C trigraphs for input. - -`--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 the programmer prescribed it. - - By default only the `c-format' form is used. The translator should - not have to care about these details. - - This implementation of `xgettext' is able to process a few awkward -cases, like strings in preprocessor macros, ANSI concatenation of -adjacent strings, and escaped end of lines for continued strings. - -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. - -`-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. - -`-w NUMBER' -`--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. - -`-s' -`--sort-output' - Generate sorted output. Note that using this option makes it much - harder for the translator to understand each message's context. - -`-F' -`--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. - -`--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 holder of the package.) Translators are expected to - transfer or disclaim the copyright for their translations, so that - package maintainers can distribute them without legal risk. If - STRING is empty, the output files are marked as being in the - public domain; in this case, the translators are expected to - disclaim their copyright, again so that package maintainers can - distribute them without legal risk. - - The default value for STRING is the Free Software Foundation, Inc., - 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. - -`-m [STRING]' -`--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. - -Informative output ------------------- - -`-h' -`--help' - Display this help and exit. - -`-V' -`--version' - Output version information and exit. - - -File: gettext.info, Node: Creating, Next: Updating, Prev: Template, Up: Top - -Creating a New PO File -********************** - - 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 -file). - - The easiest way to do so is by use of the `msginit' program. For -example: - - $ cd PACKAGE-VERSION - $ cd po - $ msginit --verbose - - The alternative way is to do the copy and modifications by hand. To -do so, the translator copies `PACKAGE.pot' to `LANG.po'. Then she -modifies the initial comments and the header entry of this file. - -* Menu: - -* msginit Invocation:: Invoking the `msginit' Program -* Header Entry:: Filling in the Header Entry - - -File: gettext.info, Node: msginit Invocation, Next: Header Entry, Prev: Creating, Up: Creating - -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. - -Input file location -------------------- - -`-i INPUTFILE' -`--input=INPUTFILE' - Input POT file. - - If no INPUTFILE is given, the current directory is searched for the -POT file. If it is `-', standard input is read. - -Output file location --------------------- - -`-o FILE' -`--output-file=FILE' - Write output to specified PO file. - - If no output file is given, it depends on the `--locale' option or -the user's locale setting. If it is `-', the results are written to -standard output. - -Output details --------------- - -`-l LL_CC' -`--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. - -`-w NUMBER' -`--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. - -Informative output ------------------- - -`-h' -`--help' - Display this help and exit. - -`-V' -`--version' - Output version information and exit. - diff --git a/doc/gettext.info-3 b/doc/gettext.info-3 index 0524b6e2d..52c95e8b2 100644 --- a/doc/gettext.info-3 +++ b/doc/gettext.info-3 @@ -30,6 +30,321 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: xgettext Invocation, Prev: Template, Up: Template + +Invoking the `xgettext' Program +=============================== + + xgettext [OPTION] [INPUTFILE] ... + + The `xgettext' program extracts translatable strings from given +input files. + +Input file location +------------------- + +`INPUTFILE ...' + Input files. + +`-f FILE' +`--files-from=FILE' + Read the names of the input files from FILE instead of getting + them from the command line. + +`-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. + + If INPUTFILE is `-', standard input is read. + +Output file location +-------------------- + +`-d NAME' +`--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'). + +`-p DIR' +`--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. + +Choice of input file language +----------------------------- + +`-L NAME' +`--language=NAME' + Specifies the language of the input files. The supported languages + are `C', `C++', `ObjectiveC', `PO', `Python', `Lisp', `EmacsLisp', + `librep', `Java', `awk', `YCP', `Tcl', `RST', `Glade'. + +`-C' +`--c++' + This is a shorthand for `--language=C++'. + + By default the language is guessed depending on the input file name +extension. + +Operation mode +-------------- + +`-j' +`--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. + +`-c [TAG]' +`--add-comments[=TAG]' + Place comment block with TAG (or those preceding keyword lines) in + output file. + +Language=C/C++ specific options +------------------------------- + +`-a' +`--extract-all' + Extract all strings. + +`-k KEYWORDSPEC' +`--keyword[=KEYWORDSPEC]' + Additional keyword to be looked for (without KEYWORDSPEC means not + to use default keywords). + + If KEYWORDSPEC is a C identifer ID, `xgettext' looks for strings + in the first argument of each call to the function or macro ID. + If KEYWORDSPEC is of the form `ID:ARGNUM', `xgettext' looks for + strings in the ARGNUMth argument of the call. If KEYWORDSPEC is + of the form `ID:ARGNUM1,ARGNUM2', `xgettext' looks for strings in + the ARGNUM1st argument and in the ARGNUM2nd argument of the call, + and treats them as singular/plural variants for a message with + plural handling. + + The default keyword specifications, which are always looked for if + not explicitly disabled, are `gettext', `dgettext:2', + `dcgettext:2', `ngettext:1,2', `dngettext:2,3', `dcngettext:2,3', + and `gettext_noop'. + +`-T' +`--trigraphs' + Understand ANSI C trigraphs for input. + +`--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 the programmer prescribed it. + + By default only the `c-format' form is used. The translator should + not have to care about these details. + + This implementation of `xgettext' is able to process a few awkward +cases, like strings in preprocessor macros, ANSI concatenation of +adjacent strings, and escaped end of lines for continued strings. + +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. + +`-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. + +`-w NUMBER' +`--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. + +`-s' +`--sort-output' + Generate sorted output. Note that using this option makes it much + harder for the translator to understand each message's context. + +`-F' +`--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. + +`--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 holder of the package.) Translators are expected to + transfer or disclaim the copyright for their translations, so that + package maintainers can distribute them without legal risk. If + STRING is empty, the output files are marked as being in the + public domain; in this case, the translators are expected to + disclaim their copyright, again so that package maintainers can + distribute them without legal risk. + + The default value for STRING is the Free Software Foundation, Inc., + 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. + +`-m [STRING]' +`--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. + +Informative output +------------------ + +`-h' +`--help' + Display this help and exit. + +`-V' +`--version' + Output version information and exit. + + +File: gettext.info, Node: Creating, Next: Updating, Prev: Template, Up: Top + +Creating a New PO File +********************** + + 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 +file). + + The easiest way to do so is by use of the `msginit' program. For +example: + + $ cd PACKAGE-VERSION + $ cd po + $ msginit --verbose + + The alternative way is to do the copy and modifications by hand. To +do so, the translator copies `PACKAGE.pot' to `LANG.po'. Then she +modifies the initial comments and the header entry of this file. + +* Menu: + +* msginit Invocation:: Invoking the `msginit' Program +* Header Entry:: Filling in the Header Entry + + +File: gettext.info, Node: msginit Invocation, Next: Header Entry, Prev: Creating, Up: Creating + +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. + +Input file location +------------------- + +`-i INPUTFILE' +`--input=INPUTFILE' + Input POT file. + + If no INPUTFILE is given, the current directory is searched for the +POT file. If it is `-', standard input is read. + +Output file location +-------------------- + +`-o FILE' +`--output-file=FILE' + Write output to specified PO file. + + If no output file is given, it depends on the `--locale' option or +the user's locale setting. If it is `-', the results are written to +standard output. + +Output details +-------------- + +`-l LL_CC' +`--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. + +`-w NUMBER' +`--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. + +Informative output +------------------ + +`-h' +`--help' + Display this help and exit. + +`-V' +`--version' + Output version information and exit. +  File: gettext.info, Node: Header Entry, Prev: msginit Invocation, Up: Creating @@ -328,6 +643,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -894,291 +1215,3 @@ the translator asks for quitting the PO file (with the `q' command), subedits are automatically resumed one at a time, so she may decide for each of them. - -File: gettext.info, Node: C Sources Context, Next: Auxiliary, Prev: Subedit, Up: Updating - -C Sources Context -================= - - PO mode is particularily 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 -appears in the program sources. - - When the translator gets to an untranslated entry, she is fairly -often faced with an original string which is not as informative as it -normally should be, being succinct, cryptic, or otherwise ambiguous. -Before chosing how to translate the string, she needs to understand -better what the string really means and how tight the translation has -to be. Most of times, when problems arise, the only way left to make -her judgment is looking at the true program sources from where this -string originated, searching for surrounding comments the programmer -might have put in there, and looking around for helping clues of _any_ -kind. - - Surely, when looking at program sources, the translator will receive -more help if she is a fluent programmer. However, even if she is not -versed in programming and feels a little lost in C code, the translator -should not be shy at taking a look, once in a while. It is most -probable that she will still be able to find some of the hints she -needs. She will learn quickly to not feel uncomfortable in program -code, paying more attention to programmer's comments, variable and -function names (if he dared chosing them well), and overall -organization, than to programmation itself. - - The following commands are meant to help the translator at getting -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 it shows -an actual use of the string to be translated. By doing so, the command -gives source program context for the string. But if the entry has no -source context references, or if all references are unresolved along -the search path for program sources, then the command diagnoses this as -an error. - - Even if `s' (or `M-s') opens a new window, the cursor stays in the -PO file window. If the translator really wants to get into the program -source window, she ought to do it explicitly, maybe by using command -`O'. - - When `s' is typed for the first time, or for a PO file entry which -is different of the last one used for getting source context, then the -command reacts by giving the first context available for this entry, if -any. If some context has already been recently displayed for the -current PO file entry, and the translator wandered off to do other -things, typing `s' again will merely resume, in another window, the -context last displayed. In particular, if the translator moved the -cursor away from the context in the source file, the command will bring -the cursor back to the context. By using `s' many times in a row, with -no other commands intervening, PO mode will cycle to the next available -contexts for this particular entry, getting back to the first context -once the last has been shown. - - The command `M-s' behaves differently. Instead of cycling through -references, it lets the translator choose a particular reference among -many, and displays that reference. It is best used with completion, if -the translator types `' immediately after `M-s', in response to -the question, she will be offered a menu of all possible references, as -a reminder of which are the acceptable answers. This command is useful -only where there are really many contexts 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. Those -two cases take proper care of most PO files. However, it might happen -that a PO file has been moved, or is edited in a different place than -its normal location. When this happens, the translator should tell PO -mode in which directory normally sits the genuine PO file. Many such -directories may be specified, and all together, they constitute what is -called the "search path" for program sources. The command `S' -(`po-consider-source-path') is used to interactively enter a new -directory at the front of the search path, and the command `M-S' -(`po-ignore-source-path') is used to select, with completion, one of -the directories she does not want anymore on the search path. - - -File: gettext.info, Node: Auxiliary, Next: Compendium, Prev: C Sources Context, Up: Updating - -Consulting Auxiliary PO Files -============================= - - 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, -it has features to ease the production of translations for many -languages 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 -PO files, and also for showing contexts for the entry under work. - - 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. -The found PO file, if any, takes the place of the current PO file in -the display (its window gets on top). Before doing so, the current PO -file is also made into an auxiliary file, if not already. So, `a' in -this newly displayed PO file will seek another PO file, and so on, 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 the -selected file has an `msgid' field identical as the one for the current -entry, and if yes, this entry becomes current. Otherwise, the cursor -of the selected file is left undisturbed. - - For all this to work fully, auxiliary PO files will have to be -normalized, in that way that `msgid' fields should be written _exactly_ -the same way. It is possible to write `msgid' fields in various ways -for representing the same string, different writing would break the -proper behaviour of the auxiliary file commands of PO mode. This is not -expected to be much a problem in practice, as most existing PO files -have their `msgid' entries written by the same GNU `gettext' tools. - - 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 the `M-x normalize' command. Until these -discrepancies 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: Updating - -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 compendium, and -to initialize untranslated entries, or to update already translated -entries, from translations kept in the compendium. - -* Menu: - -* Creating Compendia:: Merging translations for later use -* Using Compendia:: Using older translations if they fit - - -File: gettext.info, Node: Creating Compendia, Next: Using Compendia, Prev: Compendium, Up: Compendium - -Creating Compendia ------------------- - - 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'. - -Concatenate PO Files -.................... - - 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 - - By default, `msgcat' will accumulate divergent translations for the -same string. Those occurences will be marked as `fuzzy' and highly -visible decorated; calling `msgcat' on `file1.po': - - #: src/hello.c:200 - #, c-format - msgid "Report bugs to <%s>.\n" - msgstr "Comunicar `bugs' a <%s>.\n" - -and `file2.po': - - #: src/bye.c:100 - #, c-format - msgid "Report bugs to <%s>.\n" - msgstr "Comunicar \"bugs\" a <%s>.\n" - -will result in: - - #: src/hello.c:200 src/bye.c:100 - #, fuzzy, c-format - msgid "Report bugs to <%s>.\n" - msgstr "" - "#-#-#-#-# file1.po #-#-#-#-#\n" - "Comunicar `bugs' a <%s>.\n" - "#-#-#-#-# file2.po #-#-#-#-#\n" - "Comunicar \"bugs\" a <%s>.\n" - -The translator will have to resolve this "conflict" manually; she has -to decide whether the first or the second version is appropriate (or -provide a new translation), to delete the "marker lines", and finally -to remove the `fuzzy' mark. - - If the translator knows in advance the first found translation of a -message is always the best translation she can make use to the -`--use-first' switch: - - msgcat --use-first -o compendium.po file1.po file2.po - - A good compendium file must not contain `fuzzy' or untranslated -entries. If input files are "dirty" you must preprocess the input -files or postprocess the result using `msgattrib --translated ---no-fuzzy'. - -Extract a Message Subset from a PO File -....................................... - - 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 -existing PO file into one compendium file you can use `msggrep': - - msggrep --location src/getopt.c -o compendium.po file.po - - -File: gettext.info, Node: Using Compendia, Prev: Creating Compendia, Up: Compendium - -Using Compendia ---------------- - - You can use a compendium file to initialize a translation from -scratch or to update an already existing translation. - -Initialize a New Translation File -................................. - - 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 - -Update an Existing Translation File -................................... - - 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 - diff --git a/doc/gettext.info-4 b/doc/gettext.info-4 index 3c2f6bf76..220bcc6b5 100644 --- a/doc/gettext.info-4 +++ b/doc/gettext.info-4 @@ -30,6 +30,294 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: C Sources Context, Next: Auxiliary, Prev: Subedit, Up: Updating + +C Sources Context +================= + + PO mode is particularily 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 +appears in the program sources. + + When the translator gets to an untranslated entry, she is fairly +often faced with an original string which is not as informative as it +normally should be, being succinct, cryptic, or otherwise ambiguous. +Before chosing how to translate the string, she needs to understand +better what the string really means and how tight the translation has +to be. Most of times, when problems arise, the only way left to make +her judgment is looking at the true program sources from where this +string originated, searching for surrounding comments the programmer +might have put in there, and looking around for helping clues of _any_ +kind. + + Surely, when looking at program sources, the translator will receive +more help if she is a fluent programmer. However, even if she is not +versed in programming and feels a little lost in C code, the translator +should not be shy at taking a look, once in a while. It is most +probable that she will still be able to find some of the hints she +needs. She will learn quickly to not feel uncomfortable in program +code, paying more attention to programmer's comments, variable and +function names (if he dared chosing them well), and overall +organization, than to programmation itself. + + The following commands are meant to help the translator at getting +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 it shows +an actual use of the string to be translated. By doing so, the command +gives source program context for the string. But if the entry has no +source context references, or if all references are unresolved along +the search path for program sources, then the command diagnoses this as +an error. + + Even if `s' (or `M-s') opens a new window, the cursor stays in the +PO file window. If the translator really wants to get into the program +source window, she ought to do it explicitly, maybe by using command +`O'. + + When `s' is typed for the first time, or for a PO file entry which +is different of the last one used for getting source context, then the +command reacts by giving the first context available for this entry, if +any. If some context has already been recently displayed for the +current PO file entry, and the translator wandered off to do other +things, typing `s' again will merely resume, in another window, the +context last displayed. In particular, if the translator moved the +cursor away from the context in the source file, the command will bring +the cursor back to the context. By using `s' many times in a row, with +no other commands intervening, PO mode will cycle to the next available +contexts for this particular entry, getting back to the first context +once the last has been shown. + + The command `M-s' behaves differently. Instead of cycling through +references, it lets the translator choose a particular reference among +many, and displays that reference. It is best used with completion, if +the translator types `' immediately after `M-s', in response to +the question, she will be offered a menu of all possible references, as +a reminder of which are the acceptable answers. This command is useful +only where there are really many contexts 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. Those +two cases take proper care of most PO files. However, it might happen +that a PO file has been moved, or is edited in a different place than +its normal location. When this happens, the translator should tell PO +mode in which directory normally sits the genuine PO file. Many such +directories may be specified, and all together, they constitute what is +called the "search path" for program sources. The command `S' +(`po-consider-source-path') is used to interactively enter a new +directory at the front of the search path, and the command `M-S' +(`po-ignore-source-path') is used to select, with completion, one of +the directories she does not want anymore on the search path. + + +File: gettext.info, Node: Auxiliary, Next: Compendium, Prev: C Sources Context, Up: Updating + +Consulting Auxiliary PO Files +============================= + + 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, +it has features to ease the production of translations for many +languages 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 +PO files, and also for showing contexts for the entry under work. + + 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. +The found PO file, if any, takes the place of the current PO file in +the display (its window gets on top). Before doing so, the current PO +file is also made into an auxiliary file, if not already. So, `a' in +this newly displayed PO file will seek another PO file, and so on, 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 the +selected file has an `msgid' field identical as the one for the current +entry, and if yes, this entry becomes current. Otherwise, the cursor +of the selected file is left undisturbed. + + For all this to work fully, auxiliary PO files will have to be +normalized, in that way that `msgid' fields should be written _exactly_ +the same way. It is possible to write `msgid' fields in various ways +for representing the same string, different writing would break the +proper behaviour of the auxiliary file commands of PO mode. This is not +expected to be much a problem in practice, as most existing PO files +have their `msgid' entries written by the same GNU `gettext' tools. + + 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 the `M-x normalize' command. Until these +discrepancies 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: Updating + +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 compendium, and +to initialize untranslated entries, or to update already translated +entries, from translations kept in the compendium. + +* Menu: + +* Creating Compendia:: Merging translations for later use +* Using Compendia:: Using older translations if they fit + + +File: gettext.info, Node: Creating Compendia, Next: Using Compendia, Prev: Compendium, Up: Compendium + +Creating Compendia +------------------ + + 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'. + +Concatenate PO Files +.................... + + 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 + + By default, `msgcat' will accumulate divergent translations for the +same string. Those occurences will be marked as `fuzzy' and highly +visible decorated; calling `msgcat' on `file1.po': + + #: src/hello.c:200 + #, c-format + msgid "Report bugs to <%s>.\n" + msgstr "Comunicar `bugs' a <%s>.\n" + +and `file2.po': + + #: src/bye.c:100 + #, c-format + msgid "Report bugs to <%s>.\n" + msgstr "Comunicar \"bugs\" a <%s>.\n" + +will result in: + + #: src/hello.c:200 src/bye.c:100 + #, fuzzy, c-format + msgid "Report bugs to <%s>.\n" + msgstr "" + "#-#-#-#-# file1.po #-#-#-#-#\n" + "Comunicar `bugs' a <%s>.\n" + "#-#-#-#-# file2.po #-#-#-#-#\n" + "Comunicar \"bugs\" a <%s>.\n" + +The translator will have to resolve this "conflict" manually; she has +to decide whether the first or the second version is appropriate (or +provide a new translation), to delete the "marker lines", and finally +to remove the `fuzzy' mark. + + If the translator knows in advance the first found translation of a +message is always the best translation she can make use to the +`--use-first' switch: + + msgcat --use-first -o compendium.po file1.po file2.po + + A good compendium file must not contain `fuzzy' or untranslated +entries. If input files are "dirty" you must preprocess the input +files or postprocess the result using `msgattrib --translated +--no-fuzzy'. + +Extract a Message Subset from a PO File +....................................... + + 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 +existing PO file into one compendium file you can use `msggrep': + + msggrep --location src/getopt.c -o compendium.po file.po + + +File: gettext.info, Node: Using Compendia, Prev: Creating Compendia, Up: Compendium + +Using Compendia +--------------- + + You can use a compendium file to initialize a translation from +scratch or to update an already existing translation. + +Initialize a New Translation File +................................. + + 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 + +Update an Existing Translation File +................................... + + 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 +  File: gettext.info, Node: Manipulating, Next: Binaries, Prev: Updating, Up: Top @@ -208,6 +496,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -300,6 +594,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -448,6 +748,12 @@ Output details 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. @@ -575,6 +881,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -685,6 +997,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -798,6 +1116,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -980,6 +1304,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -1069,6 +1399,12 @@ Output details 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. + `-s' `--sort-output' Generate sorted output. Note that using this option makes it much @@ -1160,471 +1496,3 @@ Producing Binary MO Files * msgunfmt Invocation:: Invoking the `msgunfmt' Program * MO Files:: The Format of GNU MO Files - -File: gettext.info, Node: msgfmt Invocation, Next: msgunfmt Invocation, Prev: Binaries, Up: Binaries - -Invoking the `msgfmt' Program -============================= - - msgfmt [OPTION] FILENAME.po ... - - The `msgfmt' programs generates a binary message catalog from a -textual translation description. - -Input file location -------------------- - -`FILENAME.po ...' - -`-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. - - If an input file is `-', standard input is read. - -Operation mode --------------- - -`-j' -`--java' - Java mode: generate a Java `ResourceBundle' class. - -`--java2' - Like -java, and assume Java2 (JDK 1.2 or higher). - -`--tcl' - Tcl mode: generate a tcl/msgcat `.msg' file. - -Output file location --------------------- - -`-o 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 same as the domain name. If the strict Uniforum mode - is enabled the suffix `.mo' is added to the file name if it is not - already present. - - We find this behaviour of Sun's implementation rather silly and so - by default this mode is _not_ selected. - - If the output FILE is `-', output is written to standard output. - -Output file location in Java mode ---------------------------------- - -`-r RESOURCE' -`--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. - - The class name is determined by appending the locale name to the -resource name, separated with an underscore. The `-d' option is -mandatory. The class is written under the specified directory. - -Output file location in Tcl mode --------------------------------- - -`-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 `.msg' message catalogs. - - The `-l' and `-d' options are mandatory. The `.msg' file is written -in the specified directory. - -Input file interpretation -------------------------- - -`-c' -`--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 `printf'-like - function both strings should have the same number of `%' format - specifiers, with matching types. If the flag `c-format' or - `possible-c-format' appears in the special comment <#,> for this - entry a check is performed. For example, the check will diagnose - using `%.*s' against `%s', or `%d' against `%s', or `%d' against - `%x'. It can even handle positional parameters. - - Normally the `xgettext' program automatically decides whether a - string is a format string or not. This algorithm is not perfect, - though. It might regard a string as a format string though it is - not used in a `printf'-like function and so `msgfmt' might report - errors where there are none. - - To solve this problem the programmer can dictate the decision to - the `xgettext' program (*note c-format::). 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. *Note 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 - -`-C' -`--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. Sometimes a keyboard accelerator is also - called "keyboard mnemonic". This check verifies that if the - untranslated string has exactly one `&' character, the translated - string has exactly one `&' as well. If this option is given with - a CHAR argument, this CHAR should be a non-alphanumeric character - and is used as keyboard acceleator mark instead of `&'. - -`-f' -`--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. - -Output details --------------- - -`-a NUMBER' -`--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). - -Informative output ------------------- - -`-h' -`--help' - Display this help and exit. - -`-V' -`--version' - Output version information and exit. - -`--statistics' - Print statistics about translations. - -`-v' -`--verbose' - Increase verbosity level. - - -File: gettext.info, Node: msgunfmt Invocation, Next: MO Files, Prev: msgfmt Invocation, Up: Binaries - -Invoking the `msgunfmt' Program -=============================== - - msgunfmt [OPTION] [FILE]... - - The `msgunfmt' program converts a binary message catalog to a -Uniforum style .po file. - -Operation mode --------------- - -`-j' -`--java' - Java mode: input is a Java `ResourceBundle' class. - -`--tcl' - Tcl mode: input is a tcl/msgcat `.msg' file. - -Input file location -------------------- - -`FILE ...' - Input .mo files. - - If no input FILE is given or if it is `-', standard input is read. - -Input file location in Java mode --------------------------------- - -`-r RESOURCE' -`--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. - - The class name is determined by appending the locale name to the -resource name, separated with an underscore. The class is located -using the `CLASSPATH'. - -Input file location in Tcl mode -------------------------------- - -`-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 `.msg' message catalogs. - - The `-l' and `-d' options are mandatory. The `.msg' file is located -in the specified directory. - -Output file location --------------------- - -`-o FILE' -`--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 `-'. - -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. - -`-w NUMBER' -`--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. - -`-s' -`--sort-output' - Generate sorted output. Note that using this option makes it much - harder for the translator to understand each message's context. - -Informative output ------------------- - -`-h' -`--help' - Display this help and exit. - -`-V' -`--version' - Output version information and exit. - -`-v' -`--verbose' - Increase verbosity level. - - -File: gettext.info, Node: MO Files, Prev: msgunfmt Invocation, Up: Binaries - -The Format of GNU MO Files -========================== - - 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 -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 two -numbers: `0x950412de' and `0xde120495'. The second word describes the -current revision of the file format. For now the revision is 0. This -might change in future versions, and ensures that the readers of MO -files can distinguish new formats from old ones, so that both can be -handled correctly. The version is kept separate from the magic number, -instead of using different magic numbers for different formats, mainly -because `/etc/magic' is not updated often. It might be better to have -magic separated from internal format version identification. - - Follow a number of pointers to later tables in the file, allowing -for the extension of the prefix part of MO files without having to -recompile programs reading them. This might become useful for later -inserting a few flag bits, indication about the charset used, new -tables, or other things. - - Then, at offset O and offset T in the picture, two tables of string -descriptors can be found. In both tables, each string descriptor uses -two 32 bits integers, one for the string length, another for the offset -of the string in the MO file, counting in bytes from the start of the -file. The first table contains descriptors for the original strings, -and is sorted so the original strings are in increasing lexicographical -order. The second table contains descriptors for the translated -strings, and is parallel to the first table: to find the corresponding -translation one has to access the array slot in the second array with -the same index. - - Having the original strings sorted enables the use of simple binary -search, for when the MO file does not contain an hashing table, or for -when it is not practical to use the hashing table provided in the MO -file. This also has another advantage, as the empty string in a PO -file GNU `gettext' is usually _translated_ into some system information -attached to that particular MO file, and the empty string necessarily -becomes the first in both the original and 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 does not -win _that_ much speed. The hash table contains indices to the sorted -array of strings in the MO file. Conflict resolution is done by double -hashing. The precise hashing algorithm used is fairly dependent on GNU -`gettext' code, and is not documented here. - - As for the strings themselves, they follow the hash file, and each -is terminated with a , and this is not counted in the length -which appears in the string descriptor. The `msgfmt' program has an -option selecting the alignment for MO file strings. With this option, -each string is separately aligned so it starts at an offset which is a -multiple of the alignment value. On some RISC machines, a correct -alignment will speed things up. - - Plural forms are stored by letting the plural of the original string -follow the singular of the original string, separated through a -byte. The length which appears in the string descriptor includes both. -However, only the singular of the original string takes part in the -hash table lookup. The plural variants of the translation are all -stored consecutively, separated through a byte. Here also, the -length in the string descriptor includes all of them. - - Nothing prevents a MO file from having embedded s in strings. -However, the program interface currently used already presumes that -strings are terminated, so embedded s are somewhat useless. -But the MO file format is general enough so other interfaces would be -later possible, if for example, we ever want to implement wide -characters right in MO files, where bytes may accidently appear. -(No, we don't want to have wide characters in MO files. They would -make the file unnecessarily large, and the `wchar_t' type being -platform dependent, MO files would be platform dependent as well.) - - This particular issue has been strongly debated in the GNU `gettext' -development forum, and it is expectable that MO file format will evolve -or change over time. It is even possible that many formats may later -be supported concurrently. But surely, we have to start somewhere, and -the MO file format described here is a good start. Nothing is cast in -concrete, and the format may later evolve fairly easily, so we should -feel comfortable with the current approach. - - byte - +------------------------------------------+ - 0 | magic number = 0x950412de | - | | - 4 | file format revision = 0 | - | | - 8 | number of strings | == N - | | - 12 | offset of table with original strings | == O - | | - 16 | offset of table with translation strings | == T - | | - 20 | size of hashing table | == S - | | - 24 | offset of hashing table | == H - | | - . . - . (possibly more entries later) . - . . - | | - O | length & offset 0th string ----------------. - O + 8 | length & offset 1st string ------------------. - ... ... | | - O + ((N-1)*8)| length & offset (N-1)th string | | | - | | | | - T | length & offset 0th translation ---------------. - T + 8 | length & offset 1st translation -----------------. - ... ... | | | | - T + ((N-1)*8)| length & offset (N-1)th translation | | | | | - | | | | | | - H | start hash table | | | | | - ... ... | | | | - H + S * 4 | end hash table | | | | | - | | | | | | - | NUL terminated 0th string <----------------' | | | - | | | | | - | NUL terminated 1st string <------------------' | | - | | | | - ... ... | | - | | | | - | NUL terminated 0th translation <---------------' | - | | | - | NUL terminated 1st translation <-----------------' - | | - ... ... - | | - +------------------------------------------+ - - -File: gettext.info, Node: Users, Next: Programmers, Prev: Binaries, Up: Top - -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. - -* Menu: - -* Matrix:: The Current `ABOUT-NLS' Matrix -* Installers:: Magic for Installers -* End Users:: Magic for End Users - diff --git a/doc/gettext.info-5 b/doc/gettext.info-5 index ba3c3382e..045cb8ddb 100644 --- a/doc/gettext.info-5 +++ b/doc/gettext.info-5 @@ -30,6 +30,480 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: msgfmt Invocation, Next: msgunfmt Invocation, Prev: Binaries, Up: Binaries + +Invoking the `msgfmt' Program +============================= + + msgfmt [OPTION] FILENAME.po ... + + The `msgfmt' programs generates a binary message catalog from a +textual translation description. + +Input file location +------------------- + +`FILENAME.po ...' + +`-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. + + If an input file is `-', standard input is read. + +Operation mode +-------------- + +`-j' +`--java' + Java mode: generate a Java `ResourceBundle' class. + +`--java2' + Like -java, and assume Java2 (JDK 1.2 or higher). + +`--tcl' + Tcl mode: generate a tcl/msgcat `.msg' file. + +Output file location +-------------------- + +`-o 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 same as the domain name. If the strict Uniforum mode + is enabled the suffix `.mo' is added to the file name if it is not + already present. + + We find this behaviour of Sun's implementation rather silly and so + by default this mode is _not_ selected. + + If the output FILE is `-', output is written to standard output. + +Output file location in Java mode +--------------------------------- + +`-r RESOURCE' +`--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. + + The class name is determined by appending the locale name to the +resource name, separated with an underscore. The `-d' option is +mandatory. The class is written under the specified directory. + +Output file location in Tcl mode +-------------------------------- + +`-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 `.msg' message catalogs. + + The `-l' and `-d' options are mandatory. The `.msg' file is written +in the specified directory. + +Input file interpretation +------------------------- + +`-c' +`--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 `printf'-like + function both strings should have the same number of `%' format + specifiers, with matching types. If the flag `c-format' or + `possible-c-format' appears in the special comment <#,> for this + entry a check is performed. For example, the check will diagnose + using `%.*s' against `%s', or `%d' against `%s', or `%d' against + `%x'. It can even handle positional parameters. + + Normally the `xgettext' program automatically decides whether a + string is a format string or not. This algorithm is not perfect, + though. It might regard a string as a format string though it is + not used in a `printf'-like function and so `msgfmt' might report + errors where there are none. + + To solve this problem the programmer can dictate the decision to + the `xgettext' program (*note c-format::). 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. *Note 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 + +`-C' +`--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. Sometimes a keyboard accelerator is also + called "keyboard mnemonic". This check verifies that if the + untranslated string has exactly one `&' character, the translated + string has exactly one `&' as well. If this option is given with + a CHAR argument, this CHAR should be a non-alphanumeric character + and is used as keyboard acceleator mark instead of `&'. + +`-f' +`--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. + +Output details +-------------- + +`-a NUMBER' +`--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). + +Informative output +------------------ + +`-h' +`--help' + Display this help and exit. + +`-V' +`--version' + Output version information and exit. + +`--statistics' + Print statistics about translations. + +`-v' +`--verbose' + Increase verbosity level. + + +File: gettext.info, Node: msgunfmt Invocation, Next: MO Files, Prev: msgfmt Invocation, Up: Binaries + +Invoking the `msgunfmt' Program +=============================== + + msgunfmt [OPTION] [FILE]... + + The `msgunfmt' program converts a binary message catalog to a +Uniforum style .po file. + +Operation mode +-------------- + +`-j' +`--java' + Java mode: input is a Java `ResourceBundle' class. + +`--tcl' + Tcl mode: input is a tcl/msgcat `.msg' file. + +Input file location +------------------- + +`FILE ...' + Input .mo files. + + If no input FILE is given or if it is `-', standard input is read. + +Input file location in Java mode +-------------------------------- + +`-r RESOURCE' +`--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. + + The class name is determined by appending the locale name to the +resource name, separated with an underscore. The class is located +using the `CLASSPATH'. + +Input file location in Tcl mode +------------------------------- + +`-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 `.msg' message catalogs. + + The `-l' and `-d' options are mandatory. The `.msg' file is located +in the specified directory. + +Output file location +-------------------- + +`-o FILE' +`--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 `-'. + +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. + +`-w NUMBER' +`--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. + +`-s' +`--sort-output' + Generate sorted output. Note that using this option makes it much + harder for the translator to understand each message's context. + +Informative output +------------------ + +`-h' +`--help' + Display this help and exit. + +`-V' +`--version' + Output version information and exit. + +`-v' +`--verbose' + Increase verbosity level. + + +File: gettext.info, Node: MO Files, Prev: msgunfmt Invocation, Up: Binaries + +The Format of GNU MO Files +========================== + + 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 +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 two +numbers: `0x950412de' and `0xde120495'. The second word describes the +current revision of the file format. For now the revision is 0. This +might change in future versions, and ensures that the readers of MO +files can distinguish new formats from old ones, so that both can be +handled correctly. The version is kept separate from the magic number, +instead of using different magic numbers for different formats, mainly +because `/etc/magic' is not updated often. It might be better to have +magic separated from internal format version identification. + + Follow a number of pointers to later tables in the file, allowing +for the extension of the prefix part of MO files without having to +recompile programs reading them. This might become useful for later +inserting a few flag bits, indication about the charset used, new +tables, or other things. + + Then, at offset O and offset T in the picture, two tables of string +descriptors can be found. In both tables, each string descriptor uses +two 32 bits integers, one for the string length, another for the offset +of the string in the MO file, counting in bytes from the start of the +file. The first table contains descriptors for the original strings, +and is sorted so the original strings are in increasing lexicographical +order. The second table contains descriptors for the translated +strings, and is parallel to the first table: to find the corresponding +translation one has to access the array slot in the second array with +the same index. + + Having the original strings sorted enables the use of simple binary +search, for when the MO file does not contain an hashing table, or for +when it is not practical to use the hashing table provided in the MO +file. This also has another advantage, as the empty string in a PO +file GNU `gettext' is usually _translated_ into some system information +attached to that particular MO file, and the empty string necessarily +becomes the first in both the original and 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 does not +win _that_ much speed. The hash table contains indices to the sorted +array of strings in the MO file. Conflict resolution is done by double +hashing. The precise hashing algorithm used is fairly dependent on GNU +`gettext' code, and is not documented here. + + As for the strings themselves, they follow the hash file, and each +is terminated with a , and this is not counted in the length +which appears in the string descriptor. The `msgfmt' program has an +option selecting the alignment for MO file strings. With this option, +each string is separately aligned so it starts at an offset which is a +multiple of the alignment value. On some RISC machines, a correct +alignment will speed things up. + + Plural forms are stored by letting the plural of the original string +follow the singular of the original string, separated through a +byte. The length which appears in the string descriptor includes both. +However, only the singular of the original string takes part in the +hash table lookup. The plural variants of the translation are all +stored consecutively, separated through a byte. Here also, the +length in the string descriptor includes all of them. + + Nothing prevents a MO file from having embedded s in strings. +However, the program interface currently used already presumes that +strings are terminated, so embedded s are somewhat useless. +But the MO file format is general enough so other interfaces would be +later possible, if for example, we ever want to implement wide +characters right in MO files, where bytes may accidently appear. +(No, we don't want to have wide characters in MO files. They would +make the file unnecessarily large, and the `wchar_t' type being +platform dependent, MO files would be platform dependent as well.) + + This particular issue has been strongly debated in the GNU `gettext' +development forum, and it is expectable that MO file format will evolve +or change over time. It is even possible that many formats may later +be supported concurrently. But surely, we have to start somewhere, and +the MO file format described here is a good start. Nothing is cast in +concrete, and the format may later evolve fairly easily, so we should +feel comfortable with the current approach. + + byte + +------------------------------------------+ + 0 | magic number = 0x950412de | + | | + 4 | file format revision = 0 | + | | + 8 | number of strings | == N + | | + 12 | offset of table with original strings | == O + | | + 16 | offset of table with translation strings | == T + | | + 20 | size of hashing table | == S + | | + 24 | offset of hashing table | == H + | | + . . + . (possibly more entries later) . + . . + | | + O | length & offset 0th string ----------------. + O + 8 | length & offset 1st string ------------------. + ... ... | | + O + ((N-1)*8)| length & offset (N-1)th string | | | + | | | | + T | length & offset 0th translation ---------------. + T + 8 | length & offset 1st translation -----------------. + ... ... | | | | + T + ((N-1)*8)| length & offset (N-1)th translation | | | | | + | | | | | | + H | start hash table | | | | | + ... ... | | | | + H + S * 4 | end hash table | | | | | + | | | | | | + | NUL terminated 0th string <----------------' | | | + | | | | | + | NUL terminated 1st string <------------------' | | + | | | | + ... ... | | + | | | | + | NUL terminated 0th translation <---------------' | + | | | + | NUL terminated 1st translation <-----------------' + | | + ... ... + | | + +------------------------------------------+ + + +File: gettext.info, Node: Users, Next: Programmers, Prev: Binaries, Up: Top + +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. + +* Menu: + +* Matrix:: The Current `ABOUT-NLS' Matrix +* Installers:: Magic for Installers +* End Users:: Magic for End Users +  File: gettext.info, Node: Matrix, Next: Installers, Prev: Users, Up: Users @@ -722,471 +1196,3 @@ Four forms, special case for one and all numbers ending in 02, 03, or 04 (1) Additions are welcome. Send appropriate information to . - -File: gettext.info, Node: GUI program problems, Next: Optimized gettext, Prev: Plural forms, Up: gettext - -How to use `gettext' in GUI programs ------------------------------------- - - 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 -length. But strings which are not containing entire sentences or at -least large fragments of a sentence may appear in more than one -situation in the program but might have different translations. This is -especially true for the one-word strings which are frequently used in -GUI programs. - - As a consequence many people say that the `gettext' approach is -wrong and instead `catgets' should be used which indeed does not have -this problem. But there is a very simple and powerful method to handle -these kind of problems with the `gettext' functions. - -As as example consider the following fictional situation. A GUI program -has a menu bar with the following entries: - - +------------+------------+--------------------------------------+ - | File | Printer | | - +------------+------------+--------------------------------------+ - | Open | | Select | - | New | | Open | - +----------+ | Connect | - +----------+ - - To have the strings `File', `Printer', `Open', `New', `Select', and -`Connect' translated there has to be at some point in the code a call -to a function of the `gettext' family. But in two places the string -passed into the function would be `Open'. The translations might not -be the same and therefore we are in the dilemma described above. - - One solution to this problem is to artificially enlengthen the -strings to make them unambiguous. But what would the program do if no -translation is available? The enlengthened string is not what should be -printed. So we should use a little bit modified version of the -functions. - - To enlengthen the strings a uniform method should be used. E.g., in -the example above the strings could be chosen as - - Menu|File - Menu|Printer - Menu|File|Open - Menu|File|New - Menu|Printer|Select - Menu|Printer|Open - Menu|Printer|Connect - - Now all the strings are different and if now instead of `gettext' -the following little wrapper function is used, everything works just -fine: - - char * - sgettext (const char *msgid) - { - char *msgval = gettext (msgid); - if (msgval == msgid) - msgval = strrchr (msgid, '|') + 1; - return msgval; - } - - What this little function does is to recognize the case when no -translation is available. This can be done very efficiently by a -pointer comparison since the return value is the input value. If there -is no translation we know that the input string is in the format we used -for the Menu entries and therefore contains a `|' character. We simply -search for the last occurrence of this character and return a pointer -to the character following it. That's it! - - If one now consistently uses the enlengthened string form and -replaces the `gettext' calls with calls to `sgettext' (this is normally -limited to very few places in the GUI implementation) then it is -possible to produce a program which can be internationalized. - - The other `gettext' functions (`dgettext', `dcgettext' and the -`ngettext' equivalents) can and should have corresponding functions as -well which look almost identical, except for the parameters and the -call to the underlying function. - - Now there is of course the question why such functions do not exist -in the GNU gettext package? There are two parts of the answer to this -question. - - * They are easy to write and therefore can be provided by the - project they are used in. This is not an answer by itself and - must be seen together with the second part which is: - - * There is no way the gettext package can contain a version which - can work everywhere. The problem is the selection of the - character to separate the prefix from the actual string in the - enlenghtened string. The examples above used `|' which is a quite - good choice because it resembles a notation frequently used in - this context and it also is a character not often used in message - strings. - - But what if the character is used in message strings? Or if the - chose character is not available in the character set on the - machine one compiles (e.g., `|' is not required to exist for - ISO C; this is why the `iso646.h' file exists in ISO C programming - environments). - - There is only one more comment to be said. The wrapper function -above requires that the translations strings are not enlengthened -themselves. This is only logical. There is no need to disambiguate -the strings (since they are never used as keys for a search) and one -also saves quite some memory and disk space by doing this. - - -File: gettext.info, Node: Optimized gettext, Prev: GUI program problems, Up: gettext - -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 -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 -following example: - - { - while (...) - { - puts (gettext ("Hello world")); - } - } - -When the locale selection does not change between two runs the resulting -string is always the same. One way to use this is: - - { - str = gettext ("Hello world"); - while (...) - { - puts (str); - } - } - -But this solution is not usable in all situation (e.g. when the locale -selection changes) nor does it lead to legible code. - - For this reason, GNU `gettext' caches previous translation results. -When the same translation is requested twice, with no new message -catalogs being loaded in between, `gettext' will, the second time, find -the result through a single cache lookup. - - -File: gettext.info, Node: Comparison, Next: Using libintl.a, Prev: gettext, Up: Programmers - -Comparing the Two Interfaces -============================ - - 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. - - First we take a look at the developing process. When we write an -application using NLS provided by `gettext' we proceed as always. Only -when we come to a string which might be seen by the users and thus has -to be translated we use `gettext("...")' instead of `"..."'. At the -beginning of each source file (or in a central header file) we define - - #define gettext(String) (String) - - Even this definition can be avoided when the system supports the -`gettext' function in its C library. When we compile this code the -result is the same as if no NLS code is used. When you take a look at -the GNU `gettext' code you will see that we use `_("...")' instead of -`gettext("...")'. This reduces the number of additional characters per -translatable string to _3_ (in words: three). - - When now a production version of the program is needed we simply -replace the definition - - #define _(String) (String) - -by - - #include - #define _(String) gettext (String) - -Additionally we run the program `xgettext' on all source code file -which contain translatable strings and that's it: we have a running -program which does not depend on translations to be available, but which -can use any that becomes available. - - The same procedure can be done for the `gettext_noop' invocations -(*note Special cases::). One usually defines `gettext_noop' as a no-op -macro. So you should consider the following code for your project: - - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) - - `N_' is a short form similar to `_'. The `Makefile' in the `po/' -directory of GNU `gettext' knows by default both of the mentioned short -forms so you are invited to follow this proposal for your own ease. - - Now to `catgets'. The main problem is the work for the programmer. -Every time he comes to a translatable string he has to define a number -(or a symbolic constant) which has also be defined in the message -catalog file. He also has to take care for duplicate entries, -duplicate message IDs etc. If he wants to have the same quality in the -message catalog as the GNU `gettext' program provides he also has to -put the descriptive comments for the strings and the location in all -source code files in the message catalog. This is nearly a Mission: -Impossible. - - But there are also some points people might call advantages speaking -for `catgets'. If you have a single word in a string and this string -is used in different contexts it is likely that in one or the other -language the word has different translations. Example: - - printf ("%s: %d", gettext ("number"), number_of_errors) - - printf ("you should see %d %s", number_count, - number_count == 1 ? gettext ("number") : gettext ("numbers")) - - Here we have to translate two times the string `"number"'. Even if -you do not speak a language beside English it might be possible to -recognize that the two words have a different meaning. In German the -first appearance has to be translated to `"Anzahl"' and the second to -`"Zahl"'. - - Now you can say that this example is really esoteric. And you are -right! This is exactly how we felt about this problem and decide that -it does not weight that much. The solution for the above problem could -be very easy: - - printf ("%s %d", gettext ("number:"), number_of_errors) - - printf (number_count == 1 ? gettext ("you should see %d number") - : gettext ("you should see %d numbers"), - number_count) - - We believe that we can solve all conflicts with this method. If it -is difficult one can also consider changing one of the conflicting -string a 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: *Note Ambiguities::. - - -File: gettext.info, Node: Using libintl.a, Next: gettext grok, Prev: Comparison, Up: Programmers - -Using libintl.a in own programs -=============================== - - 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)'. - - -File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using libintl.a, Up: Programmers - -Being a `gettext' grok -====================== - - To fully exploit the functionality of the GNU `gettext' library it -is surely helpful to read the source code. But for those who don't want -to spend that much time in reading the (sometimes complicated) code here -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 how the used language is determined while executing - the `gettext' function. The method which is presented here only - works correctly with the GNU implementation of the `gettext' - functions. - - In the function `dcgettext' at every call the current setting of - the highest priority environment variable is determined and used. - Highest priority means here the following list with decreasing - priority: - - 1. `LANGUAGE' - - 2. `LC_ALL' - - 3. `LC_xxx', according to selected locale - - 4. `LANG' - - Afterwards the path is constructed using the found value and the - translation file is loaded if available. - - What is now when the value for, say, `LANGUAGE' changes. According - to the process explained above the new value of this variable is - found as soon as the `dcgettext' function is called. But this - also means the (perhaps) different message catalog file is loaded. - In other words: the used language is changed. - - 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 (*note Optimized - gettext::). A solution for this is very easy. Include the - following code in the language switching function. - - /* Change language. */ - setenv ("LANGUAGE", "fr", 1); - - /* Make change known. */ - { - extern int _nl_msg_cat_cntr; - ++_nl_msg_cat_cntr; - } - - 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 - system's native gettext implementation. - - - -File: gettext.info, Node: Temp Programmers, Prev: gettext grok, Up: Programmers - -Temporary Notes for the Programmers Chapter -=========================================== - -* Menu: - -* Temp Implementations:: Temporary - Two Possible Implementations -* Temp catgets:: Temporary - About `catgets' -* Temp WSI:: Temporary - Why a single implementation -* Temp Notes:: Temporary - Notes - - -File: gettext.info, Node: Temp Implementations, Next: Temp catgets, Prev: Temp Programmers, Up: Temp Programmers - -Temporary - Two Possible Implementations ----------------------------------------- - - 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' -method is supported by Sun, and it has been heard that the COSE -multi-vendor initiative is supporting it. Neither method is a POSIX -standard; the POSIX.1 committee had a lot of disagreement in this area. - - Neither one is in the POSIX standard. There was much disagreement -in the POSIX.1 committee about using the `gettext' routines vs. -`catgets' (XPG). In the end the committee couldn't agree on anything, -so no messaging system was included as part of the standard. I believe -the informative annex of the standard includes the XPG3 messaging -interfaces, "...as an example of a messaging system that has been -implemented..." - - They were very careful not to say anywhere that you should use one -set of interfaces over the other. For more on this topic please see -the Programming for Internationalization FAQ. - - -File: gettext.info, Node: Temp catgets, Next: Temp WSI, Prev: Temp Implementations, Up: Temp Programmers - -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 -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 -better. It currently has quite a number of limitations and these have -already been pointed out. - - However there is a great deal to be said for consistency and -standardization. A common recurring problem when writing Unix software -is the myriad portability problems across Unix platforms. It seems as -if every Unix vendor had a look at the operating system and found parts -they could improve upon. Undoubtedly, these modifications are probably -innovative and solve real problems. However, software developers have -a hard time keeping up with all these changes across so many platforms. - - And this has prompted the Unix vendors to begin to standardize their -systems. Hence the impetus for Spec1170. Every major Unix vendor has -committed to supporting this standard and every Unix software developer -waits with glee the day they can write software to this standard and -simply recompile (without having to use autoconf) across different -platforms. - - As I understand it, Spec1170 is roughly based upon version 4 of the -X/Open Portability Guidelines (XPG4). Because `catgets' and friends -are defined in XPG4, I'm led to believe that `catgets' is a part of -Spec1170 and hence will become a standardized component of all Unix -systems. - - -File: gettext.info, Node: Temp WSI, Next: Temp Notes, Prev: Temp catgets, Up: Temp Programmers - -Temporary - Why a single implementation ---------------------------------------- - - 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. -Otherwise, we'll end up with two message catalog access systems -installed with an operating system - one set of routines for packages -using GNU `gettext' for their internationalization, and another set of -routines (catgets) for all other software. Bloated? - - Supposing another catalog access system is implemented. Which do we -recommend? At least for Linux, we need to attract as many software -developers as possible. Hence we need to make it as easy for them to -port their software as possible. Which means supporting `catgets'. We -will be implementing the `libintl' code within our `libc', but does -this mean we also have to incorporate another message catalog access -scheme within our `libc' as well? And what about people who are going -to be using the `libintl' + non-`catgets' routines. When they port -their software to other platforms, they're now going to have to include -the front-end (`libintl') code plus the back-end code (the non-`catgets' -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 -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)? - - Like many parts of Unix that can be improved upon, we're stuck with -balancing compatibility with the past with useful improvements and -innovations for the future. - - -File: gettext.info, Node: Temp Notes, Prev: Temp WSI, Up: Temp Programmers - -Temporary - Notes ------------------ - - 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. - - OK. After incorporating the last changes I have to spend some time -on making the GNU/Linux `libc' `gettext' functions. So in future -Solaris is not the only system having `gettext'. - - -File: gettext.info, Node: Translators, Next: Maintainers, Prev: Programmers, Up: Top - -The Translator's View -********************* - -* Menu: - -* Trans Intro 0:: Introduction 0 -* Trans Intro 1:: Introduction 1 -* Discussions:: Discussions -* Organization:: Organization -* Information Flow:: Information Flow - diff --git a/doc/gettext.info-6 b/doc/gettext.info-6 index 905c43103..946f79b3d 100644 --- a/doc/gettext.info-6 +++ b/doc/gettext.info-6 @@ -30,6 +30,474 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: GUI program problems, Next: Optimized gettext, Prev: Plural forms, Up: gettext + +How to use `gettext' in GUI programs +------------------------------------ + + 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 +length. But strings which are not containing entire sentences or at +least large fragments of a sentence may appear in more than one +situation in the program but might have different translations. This is +especially true for the one-word strings which are frequently used in +GUI programs. + + As a consequence many people say that the `gettext' approach is +wrong and instead `catgets' should be used which indeed does not have +this problem. But there is a very simple and powerful method to handle +these kind of problems with the `gettext' functions. + +As as example consider the following fictional situation. A GUI program +has a menu bar with the following entries: + + +------------+------------+--------------------------------------+ + | File | Printer | | + +------------+------------+--------------------------------------+ + | Open | | Select | + | New | | Open | + +----------+ | Connect | + +----------+ + + To have the strings `File', `Printer', `Open', `New', `Select', and +`Connect' translated there has to be at some point in the code a call +to a function of the `gettext' family. But in two places the string +passed into the function would be `Open'. The translations might not +be the same and therefore we are in the dilemma described above. + + One solution to this problem is to artificially enlengthen the +strings to make them unambiguous. But what would the program do if no +translation is available? The enlengthened string is not what should be +printed. So we should use a little bit modified version of the +functions. + + To enlengthen the strings a uniform method should be used. E.g., in +the example above the strings could be chosen as + + Menu|File + Menu|Printer + Menu|File|Open + Menu|File|New + Menu|Printer|Select + Menu|Printer|Open + Menu|Printer|Connect + + Now all the strings are different and if now instead of `gettext' +the following little wrapper function is used, everything works just +fine: + + char * + sgettext (const char *msgid) + { + char *msgval = gettext (msgid); + if (msgval == msgid) + msgval = strrchr (msgid, '|') + 1; + return msgval; + } + + What this little function does is to recognize the case when no +translation is available. This can be done very efficiently by a +pointer comparison since the return value is the input value. If there +is no translation we know that the input string is in the format we used +for the Menu entries and therefore contains a `|' character. We simply +search for the last occurrence of this character and return a pointer +to the character following it. That's it! + + If one now consistently uses the enlengthened string form and +replaces the `gettext' calls with calls to `sgettext' (this is normally +limited to very few places in the GUI implementation) then it is +possible to produce a program which can be internationalized. + + The other `gettext' functions (`dgettext', `dcgettext' and the +`ngettext' equivalents) can and should have corresponding functions as +well which look almost identical, except for the parameters and the +call to the underlying function. + + Now there is of course the question why such functions do not exist +in the GNU gettext package? There are two parts of the answer to this +question. + + * They are easy to write and therefore can be provided by the + project they are used in. This is not an answer by itself and + must be seen together with the second part which is: + + * There is no way the gettext package can contain a version which + can work everywhere. The problem is the selection of the + character to separate the prefix from the actual string in the + enlenghtened string. The examples above used `|' which is a quite + good choice because it resembles a notation frequently used in + this context and it also is a character not often used in message + strings. + + But what if the character is used in message strings? Or if the + chose character is not available in the character set on the + machine one compiles (e.g., `|' is not required to exist for + ISO C; this is why the `iso646.h' file exists in ISO C programming + environments). + + There is only one more comment to be said. The wrapper function +above requires that the translations strings are not enlengthened +themselves. This is only logical. There is no need to disambiguate +the strings (since they are never used as keys for a search) and one +also saves quite some memory and disk space by doing this. + + +File: gettext.info, Node: Optimized gettext, Prev: GUI program problems, Up: gettext + +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 +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 +following example: + + { + while (...) + { + puts (gettext ("Hello world")); + } + } + +When the locale selection does not change between two runs the resulting +string is always the same. One way to use this is: + + { + str = gettext ("Hello world"); + while (...) + { + puts (str); + } + } + +But this solution is not usable in all situation (e.g. when the locale +selection changes) nor does it lead to legible code. + + For this reason, GNU `gettext' caches previous translation results. +When the same translation is requested twice, with no new message +catalogs being loaded in between, `gettext' will, the second time, find +the result through a single cache lookup. + + +File: gettext.info, Node: Comparison, Next: Using libintl.a, Prev: gettext, Up: Programmers + +Comparing the Two Interfaces +============================ + + 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. + + First we take a look at the developing process. When we write an +application using NLS provided by `gettext' we proceed as always. Only +when we come to a string which might be seen by the users and thus has +to be translated we use `gettext("...")' instead of `"..."'. At the +beginning of each source file (or in a central header file) we define + + #define gettext(String) (String) + + Even this definition can be avoided when the system supports the +`gettext' function in its C library. When we compile this code the +result is the same as if no NLS code is used. When you take a look at +the GNU `gettext' code you will see that we use `_("...")' instead of +`gettext("...")'. This reduces the number of additional characters per +translatable string to _3_ (in words: three). + + When now a production version of the program is needed we simply +replace the definition + + #define _(String) (String) + +by + + #include + #define _(String) gettext (String) + +Additionally we run the program `xgettext' on all source code file +which contain translatable strings and that's it: we have a running +program which does not depend on translations to be available, but which +can use any that becomes available. + + The same procedure can be done for the `gettext_noop' invocations +(*note Special cases::). One usually defines `gettext_noop' as a no-op +macro. So you should consider the following code for your project: + + #define gettext_noop(String) String + #define N_(String) gettext_noop (String) + + `N_' is a short form similar to `_'. The `Makefile' in the `po/' +directory of GNU `gettext' knows by default both of the mentioned short +forms so you are invited to follow this proposal for your own ease. + + Now to `catgets'. The main problem is the work for the programmer. +Every time he comes to a translatable string he has to define a number +(or a symbolic constant) which has also be defined in the message +catalog file. He also has to take care for duplicate entries, +duplicate message IDs etc. If he wants to have the same quality in the +message catalog as the GNU `gettext' program provides he also has to +put the descriptive comments for the strings and the location in all +source code files in the message catalog. This is nearly a Mission: +Impossible. + + But there are also some points people might call advantages speaking +for `catgets'. If you have a single word in a string and this string +is used in different contexts it is likely that in one or the other +language the word has different translations. Example: + + printf ("%s: %d", gettext ("number"), number_of_errors) + + printf ("you should see %d %s", number_count, + number_count == 1 ? gettext ("number") : gettext ("numbers")) + + Here we have to translate two times the string `"number"'. Even if +you do not speak a language beside English it might be possible to +recognize that the two words have a different meaning. In German the +first appearance has to be translated to `"Anzahl"' and the second to +`"Zahl"'. + + Now you can say that this example is really esoteric. And you are +right! This is exactly how we felt about this problem and decide that +it does not weight that much. The solution for the above problem could +be very easy: + + printf ("%s %d", gettext ("number:"), number_of_errors) + + printf (number_count == 1 ? gettext ("you should see %d number") + : gettext ("you should see %d numbers"), + number_count) + + We believe that we can solve all conflicts with this method. If it +is difficult one can also consider changing one of the conflicting +string a 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: *Note Ambiguities::. + + +File: gettext.info, Node: Using libintl.a, Next: gettext grok, Prev: Comparison, Up: Programmers + +Using libintl.a in own programs +=============================== + + 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)'. + + +File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using libintl.a, Up: Programmers + +Being a `gettext' grok +====================== + + To fully exploit the functionality of the GNU `gettext' library it +is surely helpful to read the source code. But for those who don't want +to spend that much time in reading the (sometimes complicated) code here +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 how the used language is determined while executing + the `gettext' function. The method which is presented here only + works correctly with the GNU implementation of the `gettext' + functions. + + In the function `dcgettext' at every call the current setting of + the highest priority environment variable is determined and used. + Highest priority means here the following list with decreasing + priority: + + 1. `LANGUAGE' + + 2. `LC_ALL' + + 3. `LC_xxx', according to selected locale + + 4. `LANG' + + Afterwards the path is constructed using the found value and the + translation file is loaded if available. + + What is now when the value for, say, `LANGUAGE' changes. According + to the process explained above the new value of this variable is + found as soon as the `dcgettext' function is called. But this + also means the (perhaps) different message catalog file is loaded. + In other words: the used language is changed. + + 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 (*note Optimized + gettext::). A solution for this is very easy. Include the + following code in the language switching function. + + /* Change language. */ + setenv ("LANGUAGE", "fr", 1); + + /* Make change known. */ + { + extern int _nl_msg_cat_cntr; + ++_nl_msg_cat_cntr; + } + + 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 + system's native gettext implementation. + + + +File: gettext.info, Node: Temp Programmers, Prev: gettext grok, Up: Programmers + +Temporary Notes for the Programmers Chapter +=========================================== + +* Menu: + +* Temp Implementations:: Temporary - Two Possible Implementations +* Temp catgets:: Temporary - About `catgets' +* Temp WSI:: Temporary - Why a single implementation +* Temp Notes:: Temporary - Notes + + +File: gettext.info, Node: Temp Implementations, Next: Temp catgets, Prev: Temp Programmers, Up: Temp Programmers + +Temporary - Two Possible Implementations +---------------------------------------- + + 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' +method is supported by Sun, and it has been heard that the COSE +multi-vendor initiative is supporting it. Neither method is a POSIX +standard; the POSIX.1 committee had a lot of disagreement in this area. + + Neither one is in the POSIX standard. There was much disagreement +in the POSIX.1 committee about using the `gettext' routines vs. +`catgets' (XPG). In the end the committee couldn't agree on anything, +so no messaging system was included as part of the standard. I believe +the informative annex of the standard includes the XPG3 messaging +interfaces, "...as an example of a messaging system that has been +implemented..." + + They were very careful not to say anywhere that you should use one +set of interfaces over the other. For more on this topic please see +the Programming for Internationalization FAQ. + + +File: gettext.info, Node: Temp catgets, Next: Temp WSI, Prev: Temp Implementations, Up: Temp Programmers + +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 +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 +better. It currently has quite a number of limitations and these have +already been pointed out. + + However there is a great deal to be said for consistency and +standardization. A common recurring problem when writing Unix software +is the myriad portability problems across Unix platforms. It seems as +if every Unix vendor had a look at the operating system and found parts +they could improve upon. Undoubtedly, these modifications are probably +innovative and solve real problems. However, software developers have +a hard time keeping up with all these changes across so many platforms. + + And this has prompted the Unix vendors to begin to standardize their +systems. Hence the impetus for Spec1170. Every major Unix vendor has +committed to supporting this standard and every Unix software developer +waits with glee the day they can write software to this standard and +simply recompile (without having to use autoconf) across different +platforms. + + As I understand it, Spec1170 is roughly based upon version 4 of the +X/Open Portability Guidelines (XPG4). Because `catgets' and friends +are defined in XPG4, I'm led to believe that `catgets' is a part of +Spec1170 and hence will become a standardized component of all Unix +systems. + + +File: gettext.info, Node: Temp WSI, Next: Temp Notes, Prev: Temp catgets, Up: Temp Programmers + +Temporary - Why a single implementation +--------------------------------------- + + 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. +Otherwise, we'll end up with two message catalog access systems +installed with an operating system - one set of routines for packages +using GNU `gettext' for their internationalization, and another set of +routines (catgets) for all other software. Bloated? + + Supposing another catalog access system is implemented. Which do we +recommend? At least for Linux, we need to attract as many software +developers as possible. Hence we need to make it as easy for them to +port their software as possible. Which means supporting `catgets'. We +will be implementing the `libintl' code within our `libc', but does +this mean we also have to incorporate another message catalog access +scheme within our `libc' as well? And what about people who are going +to be using the `libintl' + non-`catgets' routines. When they port +their software to other platforms, they're now going to have to include +the front-end (`libintl') code plus the back-end code (the non-`catgets' +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 +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)? + + Like many parts of Unix that can be improved upon, we're stuck with +balancing compatibility with the past with useful improvements and +innovations for the future. + + +File: gettext.info, Node: Temp Notes, Prev: Temp WSI, Up: Temp Programmers + +Temporary - Notes +----------------- + + 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. + + OK. After incorporating the last changes I have to spend some time +on making the GNU/Linux `libc' `gettext' functions. So in future +Solaris is not the only system having `gettext'. + + +File: gettext.info, Node: Translators, Next: Maintainers, Prev: Programmers, Up: Top + +The Translator's View +********************* + +* Menu: + +* Trans Intro 0:: Introduction 0 +* Trans Intro 1:: Introduction 1 +* Discussions:: Discussions +* Organization:: Organization +* Information Flow:: Information Flow +  File: gettext.info, Node: Trans Intro 0, Next: Trans Intro 1, Prev: Translators, Up: Translators @@ -596,558 +1064,3 @@ Teams ought to settle their problems themselves, if any. If you, as a maintainer, ever think there is a real problem with a team, please never try to _solve_ a team's problem on your own. - -File: gettext.info, Node: gettextize Invocation, Next: Adjusting Files, Prev: Prerequisites, Up: Maintainers - -Invoking the `gettextize' Program -================================= - - Some files are consistently and identically needed in every package -internationalized through GNU `gettext'. As a matter of convenience, -the `gettextize' program puts all these files right in your package. -This program has the following synopsis: - - gettextize [ OPTION... ] [ DIRECTORY ] - -and accepts the following options: - -`-c' -`--copy' - Copy the needed files instead of making symbolic links. Using - links would allow the package to always use the latest `gettext' - code available on the system, but it might disturb some mechanism - the maintainer is used to apply to the sources. Because running - `gettextize' is easy there shouldn't be problems with using copies. - -`-f' -`--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: - `AM_GNU_GETTEXT([external])', and internationalization will not be - enabled on systems lacking GNU gettext. - -`--no-changelog' - Don't update or create ChangeLog files. By default, `gettextize' - logs all changes (file additions, modifications ans removals) in a - file called `ChangeLog' in each affected directory. - -`--help' - Display this help and exit. - -`--version' - Output version information and exit. - - If DIRECTORY is given, this is the top level directory of a package -to prepare for using GNU `gettext'. If not given, it is assumed that -the current directory is the top level directory of such a package. - - The program `gettextize' provides the following files. However, no -existing file will be replaced unless the option `--force' (`-f') is -specified. - - 1. The `ABOUT-NLS' file is copied in the main directory of your - package, the one being at the top level. This file gives the main - indications about how to install and use the Native Language - Support features of your program. You might elect to use a more - recent copy of this `ABOUT-NLS' file than the one provided through - `gettextize', if you have one handy. You may also fetch a more - recent copy of file `ABOUT-NLS' from Translation Project sites, - and from most GNU archive sites. - - 2. A `po/' directory is created for eventually holding all - translation files, but initially only containing the file - `po/Makefile.in.in' from the GNU `gettext' distribution. (beware - the double `.in' in the file name) and a few auxiliary files. If - the `po/' directory already exists, it will be preserved along - with the files it contains, and only `Makefile.in.in' and the - auxiliary files will be overwritten. - - 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 - option `--force' (`-f') is given, the `intl/' directory is emptied - first. - - 4. The `config.rpath' file is copied into the directory containing - configuration support files. It is needed by the `AM_GNU_GETTEXT' - autoconf macro. - - - If your site support symbolic links, `gettextize' will not actually -copy the files into your package, but establish symbolic links instead. -This avoids duplicating the disk space needed in all packages. Merely -using the `-h' option while creating the `tar' archive of your -distribution will resolve each link by an actual copy in the -distribution archive. So, to insist, you really should use `-h' option -with `tar' within your `dist' goal of your main `Makefile.in'. - - It is interesting to understand that most new files for supporting -GNU `gettext' facilities in one package go in `intl/' and `po/' -subdirectories. One distinction between these two directories is that -`intl/' is meant to be completely identical in all packages using GNU -`gettext', while all newly created files, which have to be different, -go into `po/'. There is a common `Makefile.in.in' in `po/', because -the `po/' directory needs its own `Makefile', and it has been designed -so it can be identical in all packages. - - -File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gettextize Invocation, Up: Maintainers - -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 -`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 -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.11.1 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 -intended to be good examples for using GNU gettext functionality. - -* Menu: - -* po/POTFILES.in:: `POTFILES.in' in `po/' -* po/LINGUAS:: `LINGUAS' in `po/' -* po/Makevars:: `Makefile' pieces in `po/' -* configure.in:: `configure.in' at top level -* config.guess:: `config.guess', `config.sub' at top level -* aclocal:: `aclocal.m4' at top level -* acconfig:: `acconfig.h' at top level -* Makefile:: `Makefile.in' at top level -* src/Makefile:: `Makefile.in' in `src/' -* lib/gettext.h:: `gettext.h' in `lib/' - - -File: gettext.info, Node: po/POTFILES.in, Next: po/LINGUAS, Prev: Adjusting Files, Up: Adjusting Files - -`POTFILES.in' in `po/' ----------------------- - - 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: - - # List of source files containing translatable strings. - # Copyright (C) 1995 Free Software Foundation, Inc. - - # Common library files - lib/error.c - lib/getopt.c - lib/xmalloc.c - - # Package source files - src/gettext.c - src/msgfmt.c - src/xgettext.c - -Hash-marked comments and white lines are ignored. All other lines list -those source files containing strings marked for translation (*note -Mark Keywords::), in a notation relative to the top level of your whole -distribution, rather than the location of the `POTFILES.in' file itself. - - -File: gettext.info, Node: po/LINGUAS, Next: po/Makevars, Prev: po/POTFILES.in, Up: Adjusting Files - -`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: - - # Set of available languages. - de fr - -This example means that German and French PO files are available, so -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 (*note Installers::). - - -File: gettext.info, Node: po/Makevars, Next: configure.in, Prev: po/LINGUAS, Up: Adjusting Files - -`Makefile' pieces in `po/' --------------------------- - - The `po/' directory also has a file named `Makevars'. It can be -left unmodified if your package has a single message domain and, -accordingly, a single `po/' directory. Only packages which have -multiple `po/' directories at different locations need to adjust the -three variables defined in `Makevars'. - - `po/Makevars' gets inserted into the `po/Makefile' when the latter -is created. At the same time, all files called `Rules-*' in the `po/' -directory get appended to the `po/Makefile'. 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 -building catalogs `en@quot.po' and `en@boldquot.po'. The effect of -`en@quot.po' is that people who set their `LANGUAGE' environment -variable to `en@quot' will get messages with proper looking symmetric -Unicode quotation marks instead of abusing the ASCII grave accent and -the ASCII apostrophe for indicating quotations. To enable this catalog, -simply add `en@quot' to the `po/LINGUAS' file. The effect of -`en@boldquot.po' is that people who set `LANGUAGE' to `en@boldquot' -will get not only proper quotation marks, but also the quoted text will -be shown in a bold font on terminals and consoles. This catalog is -useful only for command-line programs, not GUI programs. To enable it, -similarly add `en@boldquot' to the `po/LINGUAS' file. - - -File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars, Up: Adjusting Files - -`configure.in' at top level ---------------------------- - - `configure.in' or `configure.ac' - this is the source from which -`autoconf' generates the `configure' script. - - 1. Declare the package and version. - - This is done by a set of lines like these: - - PACKAGE=gettext - VERSION=0.11.1 - AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") - AC_DEFINE_UNQUOTED(VERSION, "$VERSION") - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) - - or, if you are using GNU `automake', by a line like this: - - AM_INIT_AUTOMAKE(gettext, 0.11.1) - - Of course, you replace `gettext' with the name of your package, - and `0.11.1' by its version numbers, exactly as they should appear - in the packaged `tar' file name of your distribution - (`gettext-0.11.1.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': - - AM_GNU_GETTEXT - - This call is purposely simple, even if it generates a lot of - configure time checking and actions. - - If you have suppressed the `intl/' subdirectory by calling - `gettextize' without `--intl' option, this call should read - - AM_GNU_GETTEXT([external]) - - 3. Have output files created. - - The `AC_OUTPUT' directive, at the end of your `configure.in' file, - needs to be modified in two ways: - - AC_OUTPUT([EXISTING CONFIGURATION FILES intl/Makefile po/Makefile.in], - [EXISTING ADDITIONAL ACTIONS]) - - The modification to the first argument to `AC_OUTPUT' asks for - substitution in the `intl/' and `po/' directories. Note the `.in' - suffix used for `po/' only. This is because the distributed file - is really `po/Makefile.in.in'. - - If you have suppressed the `intl/' subdirectory by calling - `gettextize' without `--intl' option, then you don't need to add - `intl/Makefile' to the `AC_OUTPUT' line. - - - -File: gettext.info, Node: config.guess, Next: aclocal, Prev: configure.in, Up: Adjusting Files - -`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. - - You can obtain the newest version of `config.guess' and `config.sub' -from `ftp://ftp.gnu.org/pub/gnu/config/'. Less recent versions are -also contained in the GNU `automake' and GNU `libtool' packages. - - Normally, `config.guess' and `config.sub' are put at the 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', `mkinstalldirs' or `missing'. -All you need to do, other than moving the files, is to add the -following line to your `configure.in'. - - AC_CONFIG_AUX_DIR([SUBDIR]) - - -File: gettext.info, Node: aclocal, Next: acconfig, Prev: config.guess, Up: Adjusting Files - -`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', -`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4', -`lib-link.m4', `lib-prefix.m4', `progtest.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', `progtest.m4' need to be concatenated. - - If you already have an `aclocal.m4' file, then you will have to -merge the said macro files into your `aclocal.m4'. Note that if you -are upgrading from a previous release of GNU `gettext', you should most -probably _replace_ the macros (`AM_GNU_GETTEXT', etc.), as they usually -change a little from one release of GNU `gettext' to the next. Their -contents may vary as we get more experience with strange systems out -there. - - If you are using GNU `automake' 1.5 or newer, it is enough to put -these macro files into a subdirectory named `m4/' and add the line - - ACLOCAL_AMFLAGS = -I m4 - -to your top level `Makefile.am'. - - These macros check for the internationalization support functions -and related informations. Hopefully, once stabilized, these macros -might be integrated in the standard Autoconf set, because this piece of -`m4' code will be the same for all projects using GNU `gettext'. - - -File: gettext.info, Node: acconfig, Next: Makefile, Prev: aclocal, Up: Adjusting Files - -`acconfig.h' at top level -------------------------- - - 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 -package uses them independently from the `intl/' directory. - - -File: gettext.info, Node: Makefile, Next: src/Makefile, Prev: acconfig, Up: Adjusting Files - -`Makefile.in' at 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', - so the `dist:' goal will work properly (as explained further down): - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ - - 2. Add file `ABOUT-NLS' to the `DISTFILES' definition, so the file - gets distributed. - - 3. Wherever you process subdirectories in your `Makefile.in', be sure - you also process dir subdirectories `intl' and `po'. Special - rules in the `Makefiles' take care for the case where no - internationalization is wanted. - - If you are using Makefiles, either generated by automake, or - hand-written so they carefully follow the GNU coding standards, - the effected goals for which the new subdirectories must be - handled include `installdirs', `install', `uninstall', `clean', - `distclean'. - - Here is an example of a canonical order of processing. In this - example, we also define `SUBDIRS' in `Makefile.in' for it to be - further used in the `dist:' goal. - - SUBDIRS = doc intl lib src po - - Note that you must arrange for `make' to descend into the `intl' - directory before descending into other directories containing code - which make use of the `libintl.h' header file. For this reason, - here we mention `intl' before `lib' and `src'. - - 4. A delicate point is the `dist:' goal, as both `intl/Makefile' and - `po/Makefile' will later assume that the proper directory has been - set up from the main `Makefile'. Here is an example at what the - `dist:' goal might look like: - - distdir = $(PACKAGE)-$(VERSION) - dist: Makefile - rm -fr $(distdir) - mkdir $(distdir) - chmod 777 $(distdir) - for file in $(DISTFILES); do \ - ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \ - done - for subdir in $(SUBDIRS); do \ - mkdir $(distdir)/$$subdir || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $@) || exit 1; \ - done - tar chozf $(distdir).tar.gz $(distdir) - rm -fr $(distdir) - - - Note that if you are using GNU `automake', `Makefile.in' is -automatically generated from `Makefile.am', and all needed changes to -`Makefile.am' are already made by running `gettextize'. - - -File: gettext.info, Node: src/Makefile, Next: lib/gettext.h, Prev: Makefile, Up: Adjusting Files - -`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': - - 1. In view of the `dist:' goal, you should have these lines near the - beginning of `src/Makefile.in': - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ - - 2. If not done already, you should guarantee that `top_srcdir' gets - defined. This will serve for `cpp' include files. Just add the - line: - - top_srcdir = @top_srcdir@ - - 3. You might also want to define `subdir' as `src', later allowing - for almost uniform `dist:' goals in all your `Makefile.in'. At - list, the `dist:' goal below assume that you used: - - subdir = src - - 4. The `main' function of your program will normally call - `bindtextdomain' (see *note Triggering::), like this: - - bindtextdomain (PACKAGE, LOCALEDIR); - - To make LOCALEDIR known to the program, add the following lines to - Makefile.in: - - datadir = @datadir@ - localedir = $(datadir)/locale - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - - Note that `@datadir@' defaults to `$(prefix)/share', thus - `$(localedir)' defaults to `$(prefix)/share/locale'. - - 5. You should ensure that the final linking will use `@LIBINTL@' or - `@LTLIBINTL@' as a library. `@LIBINTL@' is for use without - `libtool', `@LTLIBINTL@' is for use with `libtool'. An easy way to - achieve this is to manage that it gets into `LIBS', like this: - - LIBS = @LIBINTL@ @LIBS@ - - In most packages internationalized with GNU `gettext', one will - find a directory `lib/' in which a library containing some helper - functions will be build. (You need at least the few functions - which the GNU `gettext' Library itself needs.) However some of - the functions in the `lib/' also give messages to the user which - of course should be translated, too. Taking care of this, the - support library (say `libsupport.a') should be placed before - `@LIBINTL@' and `@LIBS@' in the above example. So one has to - write this: - - LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@ - - 6. You should also ensure that directory `intl/' will be searched for - C preprocessor include files in all circumstances. So, you have to - manage so both `-I../intl' and `-I$(top_srcdir)/intl' will be - given to the C compiler. - - 7. Your `dist:' goal has to conform with others. Here is a - reasonable definition for it: - - distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) - dist: Makefile $(DISTFILES) - for file in $(DISTFILES); do \ - ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \ - done - - - -File: gettext.info, Node: lib/gettext.h, Prev: src/Makefile, Up: Adjusting Files - -`gettext.h' in `lib/' ---------------------- - - 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 - can be useful when small binaries are more important than - features, for example when building utilities for boot diskettes. - It can also be useful in order to get some specific C compiler - warnings about code quality with some older versions of GCC (older - than 3.0). - - * When the package does not include the `intl/' subdirectory, and the - libintl.h header (with its associated libintl library, if any) is - not already installed on the system, it is preferrable that the - package builds without internationalization support, rather than - to give a compilation error. - - A C preprocessor macro can be used to detect these two cases. -Usually, when `libintl.h' was found and not explicitly disabled, the -`ENABLE_NLS' macro will be defined to 1 in the autoconf generated -configuration file (usually called `config.h'). In the two negative -situations, however, this macro will not be defined, thus it will -evaluate to 0 in C preprocessor expressions. - - `gettext.h' is a convenience header file for conditional use of -`', depending on the `ENABLE_NLS' macro. If `ENABLE_NLS' is -set, it includes `'; otherwise it defines no-op substitutes -for the libintl.h functions. We recommend the use of `"gettext.h"' over -direct use of `', so that portability to older systems is -guaranteed and installers can turn off internationalization if they -want to. In the C code, you will then write - - #include "gettext.h" - -instead of - - #include - - The location of `gettext.h' is usually in a directory containing -auxiliary include files. In many GNU packages, there is a directory -`lib/' containing helper functions; `gettext.h' fits there. In other -packages, it can go into the `src' directory. - - Do not install the `gettext.h' file in public locations. Every -package that needs it should contain a copy of it on its own. - - -File: gettext.info, Node: autoconf macros, Prev: Adjusting Files, Up: Maintainers - -Autoconf macros for use in `configure.in' -========================================= - - 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'. - -* Menu: - -* AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4' -* AM_ICONV:: AM_ICONV in `iconv.m4' - diff --git a/doc/gettext.info-7 b/doc/gettext.info-7 index e0d9c0f4d..38e7987f8 100644 --- a/doc/gettext.info-7 +++ b/doc/gettext.info-7 @@ -30,6 +30,567 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: gettextize Invocation, Next: Adjusting Files, Prev: Prerequisites, Up: Maintainers + +Invoking the `gettextize' Program +================================= + + Some files are consistently and identically needed in every package +internationalized through GNU `gettext'. As a matter of convenience, +the `gettextize' program puts all these files right in your package. +This program has the following synopsis: + + gettextize [ OPTION... ] [ DIRECTORY ] + +and accepts the following options: + +`-c' +`--copy' + Copy the needed files instead of making symbolic links. Using + links would allow the package to always use the latest `gettext' + code available on the system, but it might disturb some mechanism + the maintainer is used to apply to the sources. Because running + `gettextize' is easy there shouldn't be problems with using copies. + +`-f' +`--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: + `AM_GNU_GETTEXT([external])', and internationalization will not be + enabled on systems lacking GNU gettext. + +`--no-changelog' + Don't update or create ChangeLog files. By default, `gettextize' + logs all changes (file additions, modifications ans removals) in a + file called `ChangeLog' in each affected directory. + +`--help' + Display this help and exit. + +`--version' + Output version information and exit. + + If DIRECTORY is given, this is the top level directory of a package +to prepare for using GNU `gettext'. If not given, it is assumed that +the current directory is the top level directory of such a package. + + The program `gettextize' provides the following files. However, no +existing file will be replaced unless the option `--force' (`-f') is +specified. + + 1. The `ABOUT-NLS' file is copied in the main directory of your + package, the one being at the top level. This file gives the main + indications about how to install and use the Native Language + Support features of your program. You might elect to use a more + recent copy of this `ABOUT-NLS' file than the one provided through + `gettextize', if you have one handy. You may also fetch a more + recent copy of file `ABOUT-NLS' from Translation Project sites, + and from most GNU archive sites. + + 2. A `po/' directory is created for eventually holding all + translation files, but initially only containing the file + `po/Makefile.in.in' from the GNU `gettext' distribution. (beware + the double `.in' in the file name) and a few auxiliary files. If + the `po/' directory already exists, it will be preserved along + with the files it contains, and only `Makefile.in.in' and the + auxiliary files will be overwritten. + + 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 + option `--force' (`-f') is given, the `intl/' directory is emptied + first. + + 4. The `config.rpath' file is copied into the directory containing + configuration support files. It is needed by the `AM_GNU_GETTEXT' + autoconf macro. + + + If your site support symbolic links, `gettextize' will not actually +copy the files into your package, but establish symbolic links instead. +This avoids duplicating the disk space needed in all packages. Merely +using the `-h' option while creating the `tar' archive of your +distribution will resolve each link by an actual copy in the +distribution archive. So, to insist, you really should use `-h' option +with `tar' within your `dist' goal of your main `Makefile.in'. + + It is interesting to understand that most new files for supporting +GNU `gettext' facilities in one package go in `intl/' and `po/' +subdirectories. One distinction between these two directories is that +`intl/' is meant to be completely identical in all packages using GNU +`gettext', while all newly created files, which have to be different, +go into `po/'. There is a common `Makefile.in.in' in `po/', because +the `po/' directory needs its own `Makefile', and it has been designed +so it can be identical in all packages. + + +File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gettextize Invocation, Up: Maintainers + +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 +`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 +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.11.2 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 +intended to be good examples for using GNU gettext functionality. + +* Menu: + +* po/POTFILES.in:: `POTFILES.in' in `po/' +* po/LINGUAS:: `LINGUAS' in `po/' +* po/Makevars:: `Makefile' pieces in `po/' +* configure.in:: `configure.in' at top level +* config.guess:: `config.guess', `config.sub' at top level +* aclocal:: `aclocal.m4' at top level +* acconfig:: `acconfig.h' at top level +* Makefile:: `Makefile.in' at top level +* src/Makefile:: `Makefile.in' in `src/' +* lib/gettext.h:: `gettext.h' in `lib/' + + +File: gettext.info, Node: po/POTFILES.in, Next: po/LINGUAS, Prev: Adjusting Files, Up: Adjusting Files + +`POTFILES.in' in `po/' +---------------------- + + 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: + + # List of source files containing translatable strings. + # Copyright (C) 1995 Free Software Foundation, Inc. + + # Common library files + lib/error.c + lib/getopt.c + lib/xmalloc.c + + # Package source files + src/gettext.c + src/msgfmt.c + src/xgettext.c + +Hash-marked comments and white lines are ignored. All other lines list +those source files containing strings marked for translation (*note +Mark Keywords::), in a notation relative to the top level of your whole +distribution, rather than the location of the `POTFILES.in' file itself. + + When a C file is automatically generated by a tool, like `flex' or +`bison', that doesn't introduce translatable strings by itself, it is +recommended to list in `po/POTFILES.in' the real source file (ending in +`.l' in the case of `flex', or in `.y' in the case of `bison'), not the +generated C file. + + +File: gettext.info, Node: po/LINGUAS, Next: po/Makevars, Prev: po/POTFILES.in, Up: Adjusting Files + +`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: + + # Set of available languages. + de fr + +This example means that German and French PO files are available, so +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 (*note Installers::). + + +File: gettext.info, Node: po/Makevars, Next: configure.in, Prev: po/LINGUAS, Up: Adjusting Files + +`Makefile' pieces in `po/' +-------------------------- + + The `po/' directory also has a file named `Makevars'. It can be +left unmodified if your package has a single message domain and, +accordingly, a single `po/' directory. Only packages which have +multiple `po/' directories at different locations need to adjust the +three variables defined in `Makevars'. + + `po/Makevars' gets inserted into the `po/Makefile' when the latter +is created. At the same time, all files called `Rules-*' in the `po/' +directory get appended to the `po/Makefile'. 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 +building catalogs `en@quot.po' and `en@boldquot.po'. The effect of +`en@quot.po' is that people who set their `LANGUAGE' environment +variable to `en@quot' will get messages with proper looking symmetric +Unicode quotation marks instead of abusing the ASCII grave accent and +the ASCII apostrophe for indicating quotations. To enable this catalog, +simply add `en@quot' to the `po/LINGUAS' file. The effect of +`en@boldquot.po' is that people who set `LANGUAGE' to `en@boldquot' +will get not only proper quotation marks, but also the quoted text will +be shown in a bold font on terminals and consoles. This catalog is +useful only for command-line programs, not GUI programs. To enable it, +similarly add `en@boldquot' to the `po/LINGUAS' file. + + +File: gettext.info, Node: configure.in, Next: config.guess, Prev: po/Makevars, Up: Adjusting Files + +`configure.in' at top level +--------------------------- + + `configure.in' or `configure.ac' - this is the source from which +`autoconf' generates the `configure' script. + + 1. Declare the package and version. + + This is done by a set of lines like these: + + PACKAGE=gettext + VERSION=0.11.2 + AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") + AC_DEFINE_UNQUOTED(VERSION, "$VERSION") + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + + or, if you are using GNU `automake', by a line like this: + + AM_INIT_AUTOMAKE(gettext, 0.11.2) + + Of course, you replace `gettext' with the name of your package, + and `0.11.2' by its version numbers, exactly as they should appear + in the packaged `tar' file name of your distribution + (`gettext-0.11.2.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': + + AM_GNU_GETTEXT + + This call is purposely simple, even if it generates a lot of + configure time checking and actions. + + If you have suppressed the `intl/' subdirectory by calling + `gettextize' without `--intl' option, this call should read + + AM_GNU_GETTEXT([external]) + + 3. Have output files created. + + The `AC_OUTPUT' directive, at the end of your `configure.in' file, + needs to be modified in two ways: + + AC_OUTPUT([EXISTING CONFIGURATION FILES intl/Makefile po/Makefile.in], + [EXISTING ADDITIONAL ACTIONS]) + + The modification to the first argument to `AC_OUTPUT' asks for + substitution in the `intl/' and `po/' directories. Note the `.in' + suffix used for `po/' only. This is because the distributed file + is really `po/Makefile.in.in'. + + If you have suppressed the `intl/' subdirectory by calling + `gettextize' without `--intl' option, then you don't need to add + `intl/Makefile' to the `AC_OUTPUT' line. + + + +File: gettext.info, Node: config.guess, Next: aclocal, Prev: configure.in, Up: Adjusting Files + +`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. + + You can obtain the newest version of `config.guess' and `config.sub' +from `ftp://ftp.gnu.org/pub/gnu/config/'. Less recent versions are +also contained in the GNU `automake' and GNU `libtool' packages. + + Normally, `config.guess' and `config.sub' are put at the 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', `mkinstalldirs' or `missing'. +All you need to do, other than moving the files, is to add the +following line to your `configure.in'. + + AC_CONFIG_AUX_DIR([SUBDIR]) + + +File: gettext.info, Node: aclocal, Next: acconfig, Prev: config.guess, Up: Adjusting Files + +`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', +`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4', +`lib-link.m4', `lib-prefix.m4', `progtest.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', `progtest.m4' need to be concatenated. + + If you already have an `aclocal.m4' file, then you will have to +merge the said macro files into your `aclocal.m4'. Note that if you +are upgrading from a previous release of GNU `gettext', you should most +probably _replace_ the macros (`AM_GNU_GETTEXT', etc.), as they usually +change a little from one release of GNU `gettext' to the next. Their +contents may vary as we get more experience with strange systems out +there. + + If you are using GNU `automake' 1.5 or newer, it is enough to put +these macro files into a subdirectory named `m4/' and add the line + + ACLOCAL_AMFLAGS = -I m4 + +to your top level `Makefile.am'. + + These macros check for the internationalization support functions +and related informations. Hopefully, once stabilized, these macros +might be integrated in the standard Autoconf set, because this piece of +`m4' code will be the same for all projects using GNU `gettext'. + + +File: gettext.info, Node: acconfig, Next: Makefile, Prev: aclocal, Up: Adjusting Files + +`acconfig.h' at top level +------------------------- + + 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 +package uses them independently from the `intl/' directory. + + +File: gettext.info, Node: Makefile, Next: src/Makefile, Prev: acconfig, Up: Adjusting Files + +`Makefile.in' at 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', + so the `dist:' goal will work properly (as explained further down): + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + 2. Add file `ABOUT-NLS' to the `DISTFILES' definition, so the file + gets distributed. + + 3. Wherever you process subdirectories in your `Makefile.in', be sure + you also process dir subdirectories `intl' and `po'. Special + rules in the `Makefiles' take care for the case where no + internationalization is wanted. + + If you are using Makefiles, either generated by automake, or + hand-written so they carefully follow the GNU coding standards, + the effected goals for which the new subdirectories must be + handled include `installdirs', `install', `uninstall', `clean', + `distclean'. + + Here is an example of a canonical order of processing. In this + example, we also define `SUBDIRS' in `Makefile.in' for it to be + further used in the `dist:' goal. + + SUBDIRS = doc intl lib src po + + Note that you must arrange for `make' to descend into the `intl' + directory before descending into other directories containing code + which make use of the `libintl.h' header file. For this reason, + here we mention `intl' before `lib' and `src'. + + 4. A delicate point is the `dist:' goal, as both `intl/Makefile' and + `po/Makefile' will later assume that the proper directory has been + set up from the main `Makefile'. Here is an example at what the + `dist:' goal might look like: + + distdir = $(PACKAGE)-$(VERSION) + dist: Makefile + rm -fr $(distdir) + mkdir $(distdir) + chmod 777 $(distdir) + for file in $(DISTFILES); do \ + ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \ + done + for subdir in $(SUBDIRS); do \ + mkdir $(distdir)/$$subdir || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ + done + tar chozf $(distdir).tar.gz $(distdir) + rm -fr $(distdir) + + + Note that if you are using GNU `automake', `Makefile.in' is +automatically generated from `Makefile.am', and all needed changes to +`Makefile.am' are already made by running `gettextize'. + + +File: gettext.info, Node: src/Makefile, Next: lib/gettext.h, Prev: Makefile, Up: Adjusting Files + +`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': + + 1. In view of the `dist:' goal, you should have these lines near the + beginning of `src/Makefile.in': + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + + 2. If not done already, you should guarantee that `top_srcdir' gets + defined. This will serve for `cpp' include files. Just add the + line: + + top_srcdir = @top_srcdir@ + + 3. You might also want to define `subdir' as `src', later allowing + for almost uniform `dist:' goals in all your `Makefile.in'. At + list, the `dist:' goal below assume that you used: + + subdir = src + + 4. The `main' function of your program will normally call + `bindtextdomain' (see *note Triggering::), like this: + + bindtextdomain (PACKAGE, LOCALEDIR); + + To make LOCALEDIR known to the program, add the following lines to + Makefile.in: + + datadir = @datadir@ + localedir = $(datadir)/locale + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ + + Note that `@datadir@' defaults to `$(prefix)/share', thus + `$(localedir)' defaults to `$(prefix)/share/locale'. + + 5. You should ensure that the final linking will use `@LIBINTL@' or + `@LTLIBINTL@' as a library. `@LIBINTL@' is for use without + `libtool', `@LTLIBINTL@' is for use with `libtool'. An easy way to + achieve this is to manage that it gets into `LIBS', like this: + + LIBS = @LIBINTL@ @LIBS@ + + In most packages internationalized with GNU `gettext', one will + find a directory `lib/' in which a library containing some helper + functions will be build. (You need at least the few functions + which the GNU `gettext' Library itself needs.) However some of + the functions in the `lib/' also give messages to the user which + of course should be translated, too. Taking care of this, the + support library (say `libsupport.a') should be placed before + `@LIBINTL@' and `@LIBS@' in the above example. So one has to + write this: + + LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@ + + 6. You should also ensure that directory `intl/' will be searched for + C preprocessor include files in all circumstances. So, you have to + manage so both `-I../intl' and `-I$(top_srcdir)/intl' will be + given to the C compiler. + + 7. Your `dist:' goal has to conform with others. Here is a + reasonable definition for it: + + distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) + dist: Makefile $(DISTFILES) + for file in $(DISTFILES); do \ + ln $$file $(distdir) 2>/dev/null || cp -p $$file $(distdir); \ + done + + + +File: gettext.info, Node: lib/gettext.h, Prev: src/Makefile, Up: Adjusting Files + +`gettext.h' in `lib/' +--------------------- + + 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 + can be useful when small binaries are more important than + features, for example when building utilities for boot diskettes. + It can also be useful in order to get some specific C compiler + warnings about code quality with some older versions of GCC (older + than 3.0). + + * When the package does not include the `intl/' subdirectory, and the + libintl.h header (with its associated libintl library, if any) is + not already installed on the system, it is preferrable that the + package builds without internationalization support, rather than + to give a compilation error. + + A C preprocessor macro can be used to detect these two cases. +Usually, when `libintl.h' was found and not explicitly disabled, the +`ENABLE_NLS' macro will be defined to 1 in the autoconf generated +configuration file (usually called `config.h'). In the two negative +situations, however, this macro will not be defined, thus it will +evaluate to 0 in C preprocessor expressions. + + `gettext.h' is a convenience header file for conditional use of +`', depending on the `ENABLE_NLS' macro. If `ENABLE_NLS' is +set, it includes `'; otherwise it defines no-op substitutes +for the libintl.h functions. We recommend the use of `"gettext.h"' over +direct use of `', so that portability to older systems is +guaranteed and installers can turn off internationalization if they +want to. In the C code, you will then write + + #include "gettext.h" + +instead of + + #include + + The location of `gettext.h' is usually in a directory containing +auxiliary include files. In many GNU packages, there is a directory +`lib/' containing helper functions; `gettext.h' fits there. In other +packages, it can go into the `src' directory. + + Do not install the `gettext.h' file in public locations. Every +package that needs it should contain a copy of it on its own. + + +File: gettext.info, Node: autoconf macros, Prev: Adjusting Files, Up: Maintainers + +Autoconf macros for use in `configure.in' +========================================= + + 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'. + +* Menu: + +* AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4' +* AM_ICONV:: AM_ICONV in `iconv.m4' +  File: gettext.info, Node: AM_GNU_GETTEXT, Next: AM_ICONV, Prev: autoconf macros, Up: autoconf macros @@ -981,1753 +1542,3 @@ file by use of `xgettext' or `rstconv'. At runtime, a `.mo' file corresponding to translations of this `.pot' file can be loaded using the `TranslateResourceStrings' function in the `gettext' unit. - -File: gettext.info, Node: wxWindows, Next: YCP, Prev: Pascal, Up: List of Programming Languages - -wxWindows library ------------------ - -RPMs - wxGTK, gettext - -File extension - `cpp' - -String syntax - `"abc"' - -gettext shorthand - `_("abc")' - -gettext/ngettext functions - `wxLocale::GetString', `wxGetTranslation' - -textdomain - `wxLocale::AddCatalog' - -bindtextdomain - `wxLocale::AddCatalogLookupPathPrefix' - -setlocale - `wxLocale::Init', `wxSetLocale' - -Prerequisite - `#include ' - -Use or emulate GNU gettext - emulate, see `include/wx/intl.h' and `src/common/intl.cpp' - -Extractor - `xgettext' - -Formatting with positions - -- - -Portability - fully portable - -po-mode marking - yes - - -File: gettext.info, Node: YCP, Next: Tcl, Prev: wxWindows, Up: List of Programming Languages - -YCP - YaST2 scripting language ------------------------------- - -RPMs - libycp, libycp-devel, yast2-core-translator - -File extension - `ycp' - -String syntax - `"abc"' - -gettext shorthand - `_("abc")' - -gettext/ngettext functions - `_()' with 1 or 3 arguments - -textdomain - `textdomain' statement - -bindtextdomain - -- - -setlocale - -- - -Prerequisite - -- - -Use or emulate GNU gettext - use maps instead - -Extractor - `xgettext' - -Formatting with positions - `sformat "%2 %1"' - -Portability - fully portable - -po-mode marking - -- - - -File: gettext.info, Node: Tcl, Next: Perl, Prev: YCP, Up: List of Programming Languages - -Tcl - Tk's scripting language ------------------------------ - -RPMs - tcl - -File extension - `tcl' - -String syntax - `"abc"' - -gettext shorthand - `[_ "abc"]' - -gettext/ngettext functions - `::msgcat::mc' - -textdomain - -- - -bindtextdomain - --, use `::msgcat::mcload' instead - -setlocale - automatic, uses LANG, but ignores LC_MESSAGES and LC_ALL - -Prerequisite - `package require msgcat' - `proc _ {s} {return [::msgcat::mc $s]}' - -Use or emulate GNU gettext - --, uses a Tcl specific message catalog format - -Extractor - `xgettext -k_' - -Formatting with positions - `format "%2\$d %1\$d"' - -Portability - fully portable - -po-mode marking - -- - - Before marking strings as internationalizable, substitutions of -variables into the string need to be converted to `format' -applications. For example, `"file $filename not found"' becomes -`[format "file %s not found" $filename]'. Only after this is done, can -the strings be marked and extracted. After marking, this example -becomes `[format [_ "file %s not found"] $filename]' or `[msgcat::mc -"file %s not found" $filename]'. Note that the `msgcat::mc' function -implicitly calls `format' when more than one argument is given. - - -File: gettext.info, Node: Perl, Next: PHP, Prev: Tcl, Up: List of Programming Languages - -Perl ----- - -RPMs - perl, perl-gettext - -File extension - `pl', `PL' - -String syntax - `"abc"' - -gettext shorthand - -- - -gettext/ngettext functions - `gettext', `dgettext', `dcgettext' - -textdomain - `textdomain' function - -bindtextdomain - `bindtextdomain' function - -setlocale - Use `setlocale (LC_ALL, "");' - -Prerequisite - `use POSIX;' - `use Locale::gettext;' - -Use or emulate GNU gettext - use - -Extractor - ? - -Formatting with positions - -- - -Portability - ? - -po-mode marking - -- - - -File: gettext.info, Node: PHP, Next: Pike, Prev: Perl, Up: List of Programming Languages - -PHP Hypertext Preprocessor --------------------------- - -RPMs - mod_php4, phplib, phpdoc - -File extension - `php', `php3', `php4' - -String syntax - `"abc"' - -gettext shorthand - `_("abc")' - -gettext/ngettext functions - `gettext', `dgettext', `dcgettext' - -textdomain - `textdomain' function - -bindtextdomain - `bindtextdomain' function - -setlocale - `setlocale' function - -Prerequisite - -- - -Use or emulate GNU gettext - use - -Extractor - -- - -Formatting with positions - -- - -Portability - On platforms without gettext, the functions are not available. - -po-mode marking - -- - - -File: gettext.info, Node: Pike, Prev: PHP, Up: List of Programming Languages - -Pike ----- - -RPMs - roxen - -File extension - `pike' - -String syntax - `"abc"' - -gettext shorthand - -- - -gettext/ngettext functions - `gettext', `dgettext', `dcgettext' - -textdomain - `textdomain' function - -bindtextdomain - `bindtextdomain' function - -setlocale - `setlocale' function - -Prerequisite - `import Locale.Gettext;' - -Use or emulate GNU gettext - use - -Extractor - -- - -Formatting with positions - -- - -Portability - On platforms without gettext, the functions are not available. - -po-mode marking - -- - - -File: gettext.info, Node: List of Data Formats, Prev: List of Programming Languages, Up: Programming Languages - -Internationalizable Data -======================== - - Here is a list of other data formats which can be internationalized -using GNU gettext. - -* Menu: - -* POT:: POT - Portable Object Template -* RST:: Resource String Table -* Glade:: Glade - GNOME user interface description - - -File: gettext.info, Node: POT, Next: RST, Prev: List of Data Formats, Up: List of Data Formats - -POT - Portable Object Template ------------------------------- - -RPMs - gettext - -File extension - `pot', `po' - -Extractor - `xgettext' - - -File: gettext.info, Node: RST, Next: Glade, Prev: POT, Up: List of Data Formats - -Resource String Table ---------------------- - -RPMs - fpk - -File extension - `rst' - -Extractor - `xgettext', `rstconv' - - -File: gettext.info, Node: Glade, Prev: RST, Up: List of Data Formats - -Glade - GNOME user interface description ----------------------------------------- - -RPMs - glade, libglade, xml-i18n-tools - -File extension - `glade' - -Extractor - `xgettext', `libglade-xgettext' - - -File: gettext.info, Node: Conclusion, Next: Language Codes, Prev: Programming Languages, Up: Top - -Concluding Remarks -****************** - - 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. - -* Menu: - -* History:: History of GNU `gettext' -* References:: Related Readings - - -File: gettext.info, Node: History, Next: References, Prev: Conclusion, Up: Conclusion - -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. - - 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 -then asked Jim Meyering, the maintainer, how to get those changes -folded into an official release. That first draft was full of -`#ifdef's and somewhat disconcerting, and Jim wanted to find nicer -ways. Patrick and Jim shared some tries and experimentations in this -area. Then, feeling that this might eventually have a deeper impact on -GNU, Jim wanted to know what standards were, and contacted Richard -Stallman, who very quickly and verbally described an overall design for -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 -directions, not always compatible, to the extent that after a couple of -test releases, `glocale' was torn apart. - - While Jim took some distance and time and became dad for a second -time, Roland wanted to get GNU `libc' internationalized, and got Ulrich -Drepper involved in that project. Instead of starting from `glocale', -Ulrich rewrote something from scratch, but more conformant to the set -of guidelines who emerged out of the `glocale' effort. Then, Ulrich -got people from the previous forum to involve themselves into this new -project, and the switch from `glocale' to what was first named -`msgutils', renamed `nlsutils', and later `gettext', became officially -accepted by Richard in May 1995 or so. - - Let's summarize by saying that Ulrich Drepper wrote GNU `gettext' in -April 1995. The first official release of the package, including PO -mode, occurred in July 1995, and was numbered 0.7. Other people -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 -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 -organizing and coordinating the Translation Project. After nearly a -year of informal exchanges between people from many countries, -translator teams started to exist in May 1995, through the creation and -support by Patrick D'Cruze of twenty unmoderated mailing lists for that -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 -Greg McGary, as a kind of contribution to Ulrich's package. He also -gave a hand with the GNU `gettext' Texinfo manual. - - In 1997, Ulrich Drepper released the GNU libc 2.0, which included the -`gettext', `textdomain' and `bindtextdomain' functions. - - In 2000, Ulrich Drepper added plural form handling (the `ngettext' -function) to GNU libc. Later, in 2001, he released GNU libc 2.2.x, -which is the first free C library with full internationalization -support. - - Ulrich being quite busy in his role of General Maintainer of GNU -libc, he handed over the GNU `gettext' maintenance to Bruno Haible in -2000. Bruno added the plural form handling to the tools as well, added -support for UTF-8 and CJK locales, and wrote a few new tools for -manipulating PO files. - - -File: gettext.info, Node: References, Prev: History, Up: Conclusion - -Related Readings -================ - - Eugene H. Dorr (`dorre@well.com') maintains an interesting -bibliography on internationalization matters, called -`Internationalization Reference List', which is available as: - ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt - - Michael Gschwind (`mike@vlsivie.tuwien.ac.at') maintains a -Frequently Asked Questions (FAQ) list, entitled `Programming for -Internationalisation'. This FAQ discusses writing programs which can -handle different language conventions, character sets, etc.; and is -applicable to all character set encodings, with particular emphasis on -ISO 8859-1. It is regularly published in Usenet groups -`comp.unix.questions', `comp.std.internat', -`comp.software.international', `comp.lang.c', `comp.windows.x', -`comp.std.c', `comp.answers' and `news.answers'. The home location of -this document is: - ftp://ftp.vlsivie.tuwien.ac.at/pub/8bit/ISO-programming - - Patrick D'Cruze (`pdcruze@li.org') wrote a tutorial about NLS -matters, and Jochen Hein (`Hein@student.tu-clausthal.de') took over the -responsibility of maintaining it. It may be found as: - ftp://sunsite.unc.edu/pub/Linux/utils/nls/catalogs/Incoming/... - ...locale-tutorial-0.8.txt.gz - -This site is mirrored in: - ftp://ftp.ibp.fr/pub/linux/sunsite/ - - A French version of the same tutorial should be findable at: - ftp://ftp.ibp.fr/pub/linux/french/docs/ - -together with French translations of many Linux-related documents. - - -File: gettext.info, Node: Language Codes, Next: Country Codes, Prev: Conclusion, Up: Top - -Language Codes -************** - - The ISO 639 standard defines two character codes for many languages. -All abbreviations for languages used in the Translation Project should -come from this standard. - -`aa' - Afar. - -`ab' - Abkhazian. - -`ae' - Avestan. - -`af' - Afrikaans. - -`am' - Amharic. - -`ar' - Arabic. - -`as' - Assamese. - -`ay' - Aymara. - -`az' - Azerbaijani. - -`ba' - Bashkir. - -`be' - Byelorussian; Belarusian. - -`bg' - Bulgarian. - -`bh' - Bihari. - -`bi' - Bislama. - -`bn' - Bengali; Bangla. - -`bo' - Tibetan. - -`br' - Breton. - -`bs' - Bosnian. - -`ca' - Catalan. - -`ce' - Chechen. - -`ch' - Chamorro. - -`co' - Corsican. - -`cs' - Czech. - -`cu' - Church Slavic. - -`cv' - Chuvash. - -`cy' - Welsh. - -`da' - Danish. - -`de' - German. - -`dz' - Dzongkha; Bhutani. - -`el' - Greek. - -`en' - English. - -`eo' - Esperanto. - -`es' - Spanish. - -`et' - Estonian. - -`eu' - Basque. - -`fa' - Persian. - -`fi' - Finnish. - -`fj' - Fijian; Fiji. - -`fo' - Faroese. - -`fr' - French. - -`fy' - Frisian. - -`ga' - Irish. - -`gd' - Scots; Gaelic. - -`gl' - Gallegan; Galician. - -`gn' - Guarani. - -`gu' - Gujarati. - -`gv' - Manx. - -`ha' - Hausa (?). - -`he' - Hebrew (formerly iw). - -`hi' - Hindi. - -`ho' - Hiri Motu. - -`hr' - Croatian. - -`hu' - Hungarian. - -`hy' - Armenian. - -`hz' - Herero. - -`ia' - Interlingua. - -`id' - Indonesian (formerly in). - -`ie' - Interlingue. - -`ik' - Inupiak. - -`is' - Icelandic. - -`it' - Italian. - -`iu' - Inuktitut. - -`ja' - Japanese. - -`jw' - Javanese. - -`ka' - Georgian. - -`ki' - Kikuyu. - -`kj' - Kuanyama. - -`kk' - Kazakh. - -`kl' - Kalaallisut; Greenlandic. - -`km' - Khmer; Cambodian. - -`kn' - Kannada. - -`ko' - Korean. - -`ks' - Kashmiri. - -`ku' - Kurdish. - -`kv' - Komi. - -`kw' - Cornish. - -`ky' - Kirghiz. - -`la' - Latin. - -`lb' - Letzeburgesch. - -`ln' - Lingala. - -`lo' - Lao; Laotian. - -`lt' - Lithuanian. - -`lv' - Latvian; Lettish. - -`mg' - Malagasy. - -`mh' - Marshall. - -`mi' - Maori. - -`mk' - Macedonian. - -`ml' - Malayalam. - -`mn' - Mongolian. - -`mo' - Moldavian. - -`mr' - Marathi. - -`ms' - Malay. - -`mt' - Maltese. - -`my' - Burmese. - -`na' - Nauru. - -`nb' - Norwegian Bokmaal. - -`nd' - Ndebele, North. - -`ne' - Nepali. - -`ng' - Ndonga. - -`nl' - Dutch. - -`nn' - Norwegian Nynorsk. - -`no' - Norwegian. - -`nr' - Ndebele, South. - -`nv' - Navajo. - -`ny' - Chichewa; Nyanja. - -`oc' - Occitan; Provenc,al. - -`om' - (Afan) Oromo. - -`or' - Oriya. - -`os' - Ossetian; Ossetic. - -`pa' - Panjabi; Punjabi. - -`pi' - Pali. - -`pl' - Polish. - -`ps' - Pashto, Pushto. - -`pt' - Portuguese. - -`qu' - Quechua. - -`rm' - Rhaeto-Romance. - -`rn' - Rundi; Kirundi. - -`ro' - Romanian. - -`ru' - Russian. - -`rw' - Kinyarwanda. - -`sa' - Sanskrit. - -`sc' - Sardinian. - -`sd' - Sindhi. - -`se' - Northern Sami. - -`sg' - Sango; Sangro. - -`si' - Sinhalese. - -`sk' - Slovak. - -`sl' - Slovenian. - -`sm' - Samoan. - -`sn' - Shona. - -`so' - Somali. - -`sq' - Albanian. - -`sr' - Serbian. - -`ss' - Swati; Siswati. - -`st' - Sesotho; Sotho, Southern. - -`su' - Sundanese. - -`sv' - Swedish. - -`sw' - Swahili. - -`ta' - Tamil. - -`te' - Telugu. - -`tg' - Tajik. - -`th' - Thai. - -`ti' - Tigrinya. - -`tk' - Turkmen. - -`tl' - Tagalog. - -`tn' - Tswana; Setswana. - -`to' - Tonga (?). - -`tr' - Turkish. - -`ts' - Tsonga. - -`tt' - Tatar. - -`tw' - Twi. - -`ty' - Tahitian. - -`ug' - Uighur. - -`uk' - Ukrainian. - -`ur' - Urdu. - -`uz' - Uzbek. - -`vi' - Vietnamese. - -`vo' - Volapu"k; Volapuk. - -`wo' - Wolof. - -`xh' - Xhosa. - -`yi' - Yiddish (formerly ji). - -`yo' - Yoruba. - -`za' - Zhuang. - -`zh' - Chinese. - -`zu' - Zulu. - - -File: gettext.info, Node: Country Codes, Next: Program Index, Prev: Language Codes, Up: Top - -Country Codes -************* - - 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. - -`AD' - Andorra. - -`AE' - United Arab Emirates. - -`AF' - Afghanistan. - -`AG' - Antigua and Barbuda. - -`AI' - Anguilla. - -`AL' - Albania. - -`AM' - Armenia. - -`AN' - Netherlands Antilles. - -`AO' - Angola. - -`AQ' - Antarctica. - -`AR' - Argentina. - -`AS' - Samoa (American). - -`AT' - Austria. - -`AU' - Australia. - -`AW' - Aruba. - -`AZ' - Azerbaijan. - -`BA' - Bosnia and Herzegovina. - -`BB' - Barbados. - -`BD' - Bangladesh. - -`BE' - Belgium. - -`BF' - Burkina Faso. - -`BG' - Bulgaria. - -`BH' - Bahrain. - -`BI' - Burundi. - -`BJ' - Benin. - -`BM' - Bermuda. - -`BN' - Brunei. - -`BO' - Bolivia. - -`BR' - Brazil. - -`BS' - Bahamas. - -`BT' - Bhutan. - -`BV' - Bouvet Island. - -`BW' - Botswana. - -`BY' - Belarus. - -`BZ' - Belize. - -`CA' - Canada. - -`CC' - Cocos (Keeling) Islands. - -`CD' - Congo (Dem. Rep.). - -`CF' - Central African Rep.. - -`CG' - Congo (Rep.). - -`CH' - Switzerland. - -`CI' - Cote d'Ivoire. - -`CK' - Cook Islands. - -`CL' - Chile. - -`CM' - Cameroon. - -`CN' - China. - -`CO' - Colombia. - -`CR' - Costa Rica. - -`CU' - Cuba. - -`CV' - Cape Verde. - -`CX' - Christmas Island. - -`CY' - Cyprus. - -`CZ' - Czech Republic. - -`DE' - Germany. - -`DJ' - Djibouti. - -`DK' - Denmark. - -`DM' - Dominica. - -`DO' - Dominican Republic. - -`DZ' - Algeria. - -`EC' - Ecuador. - -`EE' - Estonia. - -`EG' - Egypt. - -`EH' - Western Sahara. - -`ER' - Eritrea. - -`ES' - Spain. - -`ET' - Ethiopia. - -`FI' - Finland. - -`FJ' - Fiji. - -`FK' - Falkland Islands. - -`FM' - Micronesia. - -`FO' - Faeroe Islands. - -`FR' - France. - -`GA' - Gabon. - -`GB' - Britain (UK). - -`GD' - Grenada. - -`GE' - Georgia. - -`GF' - French Guiana. - -`GH' - Ghana. - -`GI' - Gibraltar. - -`GL' - Greenland. - -`GM' - Gambia. - -`GN' - Guinea. - -`GP' - Guadeloupe. - -`GQ' - Equatorial Guinea. - -`GR' - Greece. - -`GS' - South Georgia and the South Sandwich Islands. - -`GT' - Guatemala. - -`GU' - Guam. - -`GW' - Guinea-Bissau. - -`GY' - Guyana. - -`HK' - Hong Kong. - -`HM' - Heard Island and McDonald Islands. - -`HN' - Honduras. - -`HR' - Croatia. - -`HT' - Haiti. - -`HU' - Hungary. - -`ID' - Indonesia. - -`IE' - Ireland. - -`IL' - Israel. - -`IN' - India. - -`IO' - British Indian Ocean Territory. - -`IQ' - Iraq. - -`IR' - Iran. - -`IS' - Iceland. - -`IT' - Italy. - -`JM' - Jamaica. - -`JO' - Jordan. - -`JP' - Japan. - -`KE' - Kenya. - -`KG' - Kyrgyzstan. - -`KH' - Cambodia. - -`KI' - Kiribati. - -`KM' - Comoros. - -`KN' - St Kitts and Nevis. - -`KP' - Korea (North). - -`KR' - Korea (South). - -`KW' - Kuwait. - -`KY' - Cayman Islands. - -`KZ' - Kazakhstan. - -`LA' - Laos. - -`LB' - Lebanon. - -`LC' - St Lucia. - -`LI' - Liechtenstein. - -`LK' - Sri Lanka. - -`LR' - Liberia. - -`LS' - Lesotho. - -`LT' - Lithuania. - -`LU' - Luxembourg. - -`LV' - Latvia. - -`LY' - Libya. - -`MA' - Morocco. - -`MC' - Monaco. - -`MD' - Moldova. - -`MG' - Madagascar. - -`MH' - Marshall Islands. - -`MK' - Macedonia. - -`ML' - Mali. - -`MM' - Myanmar (Burma). - -`MN' - Mongolia. - -`MO' - Macao. - -`MP' - Northern Mariana Islands. - -`MQ' - Martinique. - -`MR' - Mauritania. - -`MS' - Montserrat. - -`MT' - Malta. - -`MU' - Mauritius. - -`MV' - Maldives. - -`MW' - Malawi. - -`MX' - Mexico. - -`MY' - Malaysia. - -`MZ' - Mozambique. - -`NA' - Namibia. - -`NC' - New Caledonia. - -`NE' - Niger. - -`NF' - Norfolk Island. - -`NG' - Nigeria. - -`NI' - Nicaragua. - -`NL' - Netherlands. - -`NO' - Norway. - -`NP' - Nepal. - -`NR' - Nauru. - -`NU' - Niue. - -`NZ' - New Zealand. - -`OM' - Oman. - -`PA' - Panama. - -`PE' - Peru. - -`PF' - French Polynesia. - -`PG' - Papua New Guinea. - -`PH' - Philippines. - -`PK' - Pakistan. - -`PL' - Poland. - -`PM' - St Pierre and Miquelon. - -`PN' - Pitcairn. - -`PR' - Puerto Rico. - -`PS' - Palestine. - -`PT' - Portugal. - -`PW' - Palau. - -`PY' - Paraguay. - -`QA' - Qatar. - -`RE' - Reunion. - -`RO' - Romania. - -`RU' - Russia. - -`RW' - Rwanda. - -`SA' - Saudi Arabia. - -`SB' - Solomon Islands. - -`SC' - Seychelles. - -`SD' - Sudan. - -`SE' - Sweden. - -`SG' - Singapore. - -`SH' - St Helena. - -`SI' - Slovenia. - -`SJ' - Svalbard and Jan Mayen. - -`SK' - Slovakia. - -`SL' - Sierra Leone. - -`SM' - San Marino. - -`SN' - Senegal. - -`SO' - Somalia. - -`SR' - Suriname. - -`ST' - Sao Tome and Principe. - -`SV' - El Salvador. - -`SY' - Syria. - -`SZ' - Swaziland. - -`TC' - Turks and Caicos Is. - -`TD' - Chad. - -`TF' - French Southern and Antarctic Lands. - -`TG' - Togo. - -`TH' - Thailand. - -`TJ' - Tajikistan. - -`TK' - Tokelau. - -`TM' - Turkmenistan. - -`TN' - Tunisia. - -`TO' - Tonga. - -`TP' - East Timor. - -`TR' - Turkey. - -`TT' - Trinidad and Tobago. - -`TV' - Tuvalu. - -`TW' - Taiwan. - -`TZ' - Tanzania. - -`UA' - Ukraine. - -`UG' - Uganda. - -`UM' - US minor outlying islands. - -`US' - United States. - -`UY' - Uruguay. - -`UZ' - Uzbekistan. - -`VA' - Vatican City. - -`VC' - St Vincent. - -`VE' - Venezuela. - -`VG' - Virgin Islands (UK). - -`VI' - Virgin Islands (US). - -`VN' - Vietnam. - -`VU' - Vanuatu. - -`WF' - Wallis and Futuna. - -`WS' - Samoa (Western). - -`YE' - Yemen. - -`YT' - Mayotte. - -`YU' - Yugoslavia. - -`ZA' - South Africa. - -`ZM' - Zambia. - -`ZW' - Zimbabwe. - - -File: gettext.info, Node: Program Index, Next: Option Index, Prev: Country Codes, Up: Top - -Program Index -************* - -* Menu: - -* gettext <1>: bash. -* gettext: sh. -* gettextize: gettextize Invocation. -* msgattrib: msgattrib Invocation. -* msgcat: msgcat Invocation. -* msgcmp: msgcmp Invocation. -* msgcomm: msgcomm Invocation. -* msgconv: msgconv Invocation. -* msgen: msgen Invocation. -* msgexec: msgexec Invocation. -* msgfilter: msgfilter Invocation. -* msgfmt: msgfmt Invocation. -* msggrep: msggrep Invocation. -* msginit: msginit Invocation. -* msgmerge: msgmerge Invocation. -* msgunfmt: msgunfmt Invocation. -* msguniq: msguniq Invocation. -* ngettext <1>: bash. -* ngettext: sh. -* xgettext: xgettext Invocation. - diff --git a/doc/gettext.info-8 b/doc/gettext.info-8 index 9380158f7..e0b551bdb 100644 --- a/doc/gettext.info-8 +++ b/doc/gettext.info-8 @@ -30,6 +30,1762 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: wxWindows, Next: YCP, Prev: Pascal, Up: List of Programming Languages + +wxWindows library +----------------- + +RPMs + wxGTK, gettext + +File extension + `cpp' + +String syntax + `"abc"' + +gettext shorthand + `_("abc")' + +gettext/ngettext functions + `wxLocale::GetString', `wxGetTranslation' + +textdomain + `wxLocale::AddCatalog' + +bindtextdomain + `wxLocale::AddCatalogLookupPathPrefix' + +setlocale + `wxLocale::Init', `wxSetLocale' + +Prerequisite + `#include ' + +Use or emulate GNU gettext + emulate, see `include/wx/intl.h' and `src/common/intl.cpp' + +Extractor + `xgettext' + +Formatting with positions + -- + +Portability + fully portable + +po-mode marking + yes + + +File: gettext.info, Node: YCP, Next: Tcl, Prev: wxWindows, Up: List of Programming Languages + +YCP - YaST2 scripting language +------------------------------ + +RPMs + libycp, libycp-devel, yast2-core-translator + +File extension + `ycp' + +String syntax + `"abc"' + +gettext shorthand + `_("abc")' + +gettext/ngettext functions + `_()' with 1 or 3 arguments + +textdomain + `textdomain' statement + +bindtextdomain + -- + +setlocale + -- + +Prerequisite + -- + +Use or emulate GNU gettext + use maps instead + +Extractor + `xgettext' + +Formatting with positions + `sformat "%2 %1"' + +Portability + fully portable + +po-mode marking + -- + + +File: gettext.info, Node: Tcl, Next: Perl, Prev: YCP, Up: List of Programming Languages + +Tcl - Tk's scripting language +----------------------------- + +RPMs + tcl + +File extension + `tcl' + +String syntax + `"abc"' + +gettext shorthand + `[_ "abc"]' + +gettext/ngettext functions + `::msgcat::mc' + +textdomain + -- + +bindtextdomain + --, use `::msgcat::mcload' instead + +setlocale + automatic, uses LANG, but ignores LC_MESSAGES and LC_ALL + +Prerequisite + `package require msgcat' + `proc _ {s} {return [::msgcat::mc $s]}' + +Use or emulate GNU gettext + --, uses a Tcl specific message catalog format + +Extractor + `xgettext -k_' + +Formatting with positions + `format "%2\$d %1\$d"' + +Portability + fully portable + +po-mode marking + -- + + Before marking strings as internationalizable, substitutions of +variables into the string need to be converted to `format' +applications. For example, `"file $filename not found"' becomes +`[format "file %s not found" $filename]'. Only after this is done, can +the strings be marked and extracted. After marking, this example +becomes `[format [_ "file %s not found"] $filename]' or `[msgcat::mc +"file %s not found" $filename]'. Note that the `msgcat::mc' function +implicitly calls `format' when more than one argument is given. + + +File: gettext.info, Node: Perl, Next: PHP, Prev: Tcl, Up: List of Programming Languages + +Perl +---- + +RPMs + perl, perl-gettext + +File extension + `pl', `PL' + +String syntax + `"abc"' + +gettext shorthand + -- + +gettext/ngettext functions + `gettext', `dgettext', `dcgettext' + +textdomain + `textdomain' function + +bindtextdomain + `bindtextdomain' function + +setlocale + Use `setlocale (LC_ALL, "");' + +Prerequisite + `use POSIX;' + `use Locale::gettext;' + +Use or emulate GNU gettext + use + +Extractor + ? + +Formatting with positions + -- + +Portability + ? + +po-mode marking + -- + + +File: gettext.info, Node: PHP, Next: Pike, Prev: Perl, Up: List of Programming Languages + +PHP Hypertext Preprocessor +-------------------------- + +RPMs + mod_php4, phplib, phpdoc + +File extension + `php', `php3', `php4' + +String syntax + `"abc"' + +gettext shorthand + `_("abc")' + +gettext/ngettext functions + `gettext', `dgettext', `dcgettext' + +textdomain + `textdomain' function + +bindtextdomain + `bindtextdomain' function + +setlocale + `setlocale' function + +Prerequisite + -- + +Use or emulate GNU gettext + use + +Extractor + -- + +Formatting with positions + -- + +Portability + On platforms without gettext, the functions are not available. + +po-mode marking + -- + + +File: gettext.info, Node: Pike, Prev: PHP, Up: List of Programming Languages + +Pike +---- + +RPMs + roxen + +File extension + `pike' + +String syntax + `"abc"' + +gettext shorthand + -- + +gettext/ngettext functions + `gettext', `dgettext', `dcgettext' + +textdomain + `textdomain' function + +bindtextdomain + `bindtextdomain' function + +setlocale + `setlocale' function + +Prerequisite + `import Locale.Gettext;' + +Use or emulate GNU gettext + use + +Extractor + -- + +Formatting with positions + -- + +Portability + On platforms without gettext, the functions are not available. + +po-mode marking + -- + + +File: gettext.info, Node: List of Data Formats, Prev: List of Programming Languages, Up: Programming Languages + +Internationalizable Data +======================== + + Here is a list of other data formats which can be internationalized +using GNU gettext. + +* Menu: + +* POT:: POT - Portable Object Template +* RST:: Resource String Table +* Glade:: Glade - GNOME user interface description + + +File: gettext.info, Node: POT, Next: RST, Prev: List of Data Formats, Up: List of Data Formats + +POT - Portable Object Template +------------------------------ + +RPMs + gettext + +File extension + `pot', `po' + +Extractor + `xgettext' + + +File: gettext.info, Node: RST, Next: Glade, Prev: POT, Up: List of Data Formats + +Resource String Table +--------------------- + +RPMs + fpk + +File extension + `rst' + +Extractor + `xgettext', `rstconv' + + +File: gettext.info, Node: Glade, Prev: RST, Up: List of Data Formats + +Glade - GNOME user interface description +---------------------------------------- + +RPMs + glade, libglade, xml-i18n-tools + +File extension + `glade' + +Extractor + `xgettext', `libglade-xgettext' + + +File: gettext.info, Node: Conclusion, Next: Language Codes, Prev: Programming Languages, Up: Top + +Concluding Remarks +****************** + + 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. + +* Menu: + +* History:: History of GNU `gettext' +* References:: Related Readings + + +File: gettext.info, Node: History, Next: References, Prev: Conclusion, Up: Conclusion + +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. + + 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 +then asked Jim Meyering, the maintainer, how to get those changes +folded into an official release. That first draft was full of +`#ifdef's and somewhat disconcerting, and Jim wanted to find nicer +ways. Patrick and Jim shared some tries and experimentations in this +area. Then, feeling that this might eventually have a deeper impact on +GNU, Jim wanted to know what standards were, and contacted Richard +Stallman, who very quickly and verbally described an overall design for +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 +directions, not always compatible, to the extent that after a couple of +test releases, `glocale' was torn apart. + + While Jim took some distance and time and became dad for a second +time, Roland wanted to get GNU `libc' internationalized, and got Ulrich +Drepper involved in that project. Instead of starting from `glocale', +Ulrich rewrote something from scratch, but more conformant to the set +of guidelines who emerged out of the `glocale' effort. Then, Ulrich +got people from the previous forum to involve themselves into this new +project, and the switch from `glocale' to what was first named +`msgutils', renamed `nlsutils', and later `gettext', became officially +accepted by Richard in May 1995 or so. + + Let's summarize by saying that Ulrich Drepper wrote GNU `gettext' in +April 1995. The first official release of the package, including PO +mode, occurred in July 1995, and was numbered 0.7. Other people +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 +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 +organizing and coordinating the Translation Project. After nearly a +year of informal exchanges between people from many countries, +translator teams started to exist in May 1995, through the creation and +support by Patrick D'Cruze of twenty unmoderated mailing lists for that +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 +Greg McGary, as a kind of contribution to Ulrich's package. He also +gave a hand with the GNU `gettext' Texinfo manual. + + In 1997, Ulrich Drepper released the GNU libc 2.0, which included the +`gettext', `textdomain' and `bindtextdomain' functions. + + In 2000, Ulrich Drepper added plural form handling (the `ngettext' +function) to GNU libc. Later, in 2001, he released GNU libc 2.2.x, +which is the first free C library with full internationalization +support. + + Ulrich being quite busy in his role of General Maintainer of GNU +libc, he handed over the GNU `gettext' maintenance to Bruno Haible in +2000. Bruno added the plural form handling to the tools as well, added +support for UTF-8 and CJK locales, and wrote a few new tools for +manipulating PO files. + + +File: gettext.info, Node: References, Prev: History, Up: Conclusion + +Related Readings +================ + + Eugene H. Dorr (`dorre@well.com') maintains an interesting +bibliography on internationalization matters, called +`Internationalization Reference List', which is available as: + ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt + + Michael Gschwind (`mike@vlsivie.tuwien.ac.at') maintains a +Frequently Asked Questions (FAQ) list, entitled `Programming for +Internationalisation'. This FAQ discusses writing programs which can +handle different language conventions, character sets, etc.; and is +applicable to all character set encodings, with particular emphasis on +ISO 8859-1. It is regularly published in Usenet groups +`comp.unix.questions', `comp.std.internat', +`comp.software.international', `comp.lang.c', `comp.windows.x', +`comp.std.c', `comp.answers' and `news.answers'. The home location of +this document is: + ftp://ftp.vlsivie.tuwien.ac.at/pub/8bit/ISO-programming + + Patrick D'Cruze (`pdcruze@li.org') wrote a tutorial about NLS +matters, and Jochen Hein (`Hein@student.tu-clausthal.de') took over the +responsibility of maintaining it. It may be found as: + ftp://sunsite.unc.edu/pub/Linux/utils/nls/catalogs/Incoming/... + ...locale-tutorial-0.8.txt.gz + +This site is mirrored in: + ftp://ftp.ibp.fr/pub/linux/sunsite/ + + A French version of the same tutorial should be findable at: + ftp://ftp.ibp.fr/pub/linux/french/docs/ + +together with French translations of many Linux-related documents. + + +File: gettext.info, Node: Language Codes, Next: Country Codes, Prev: Conclusion, Up: Top + +Language Codes +************** + + The ISO 639 standard defines two character codes for many languages. +All abbreviations for languages used in the Translation Project should +come from this standard. + +`aa' + Afar. + +`ab' + Abkhazian. + +`ae' + Avestan. + +`af' + Afrikaans. + +`am' + Amharic. + +`ar' + Arabic. + +`as' + Assamese. + +`ay' + Aymara. + +`az' + Azerbaijani. + +`ba' + Bashkir. + +`be' + Byelorussian; Belarusian. + +`bg' + Bulgarian. + +`bh' + Bihari. + +`bi' + Bislama. + +`bn' + Bengali; Bangla. + +`bo' + Tibetan. + +`br' + Breton. + +`bs' + Bosnian. + +`ca' + Catalan. + +`ce' + Chechen. + +`ch' + Chamorro. + +`co' + Corsican. + +`cs' + Czech. + +`cu' + Church Slavic. + +`cv' + Chuvash. + +`cy' + Welsh. + +`da' + Danish. + +`de' + German. + +`dz' + Dzongkha; Bhutani. + +`el' + Greek. + +`en' + English. + +`eo' + Esperanto. + +`es' + Spanish. + +`et' + Estonian. + +`eu' + Basque. + +`fa' + Persian. + +`fi' + Finnish. + +`fj' + Fijian; Fiji. + +`fo' + Faroese. + +`fr' + French. + +`fy' + Frisian. + +`ga' + Irish. + +`gd' + Scots; Gaelic. + +`gl' + Gallegan; Galician. + +`gn' + Guarani. + +`gu' + Gujarati. + +`gv' + Manx. + +`ha' + Hausa (?). + +`he' + Hebrew (formerly iw). + +`hi' + Hindi. + +`ho' + Hiri Motu. + +`hr' + Croatian. + +`hu' + Hungarian. + +`hy' + Armenian. + +`hz' + Herero. + +`ia' + Interlingua. + +`id' + Indonesian (formerly in). + +`ie' + Interlingue. + +`ik' + Inupiak. + +`io' + Ido. + +`is' + Icelandic. + +`it' + Italian. + +`iu' + Inuktitut. + +`ja' + Japanese. + +`jv' + Javanese. + +`ka' + Georgian. + +`ki' + Kikuyu. + +`kj' + Kuanyama. + +`kk' + Kazakh. + +`kl' + Kalaallisut; Greenlandic. + +`km' + Khmer; Cambodian. + +`kn' + Kannada. + +`ko' + Korean. + +`ks' + Kashmiri. + +`ku' + Kurdish. + +`kv' + Komi. + +`kw' + Cornish. + +`ky' + Kirghiz. + +`la' + Latin. + +`lb' + Letzeburgesch. + +`ln' + Lingala. + +`lo' + Lao; Laotian. + +`lt' + Lithuanian. + +`lv' + Latvian; Lettish. + +`mg' + Malagasy. + +`mh' + Marshall. + +`mi' + Maori. + +`mk' + Macedonian. + +`ml' + Malayalam. + +`mn' + Mongolian. + +`mo' + Moldavian. + +`mr' + Marathi. + +`ms' + Malay. + +`mt' + Maltese. + +`my' + Burmese. + +`na' + Nauru. + +`nb' + Norwegian Bokmaal. + +`nd' + Ndebele, North. + +`ne' + Nepali. + +`ng' + Ndonga. + +`nl' + Dutch. + +`nn' + Norwegian Nynorsk. + +`no' + Norwegian. + +`nr' + Ndebele, South. + +`nv' + Navajo. + +`ny' + Chichewa; Nyanja. + +`oc' + Occitan; Provenc,al. + +`om' + (Afan) Oromo. + +`or' + Oriya. + +`os' + Ossetian; Ossetic. + +`pa' + Panjabi; Punjabi. + +`pi' + Pali. + +`pl' + Polish. + +`ps' + Pashto, Pushto. + +`pt' + Portuguese. + +`qu' + Quechua. + +`rm' + Rhaeto-Romance. + +`rn' + Rundi; Kirundi. + +`ro' + Romanian. + +`ru' + Russian. + +`rw' + Kinyarwanda. + +`sa' + Sanskrit. + +`sc' + Sardinian. + +`sd' + Sindhi. + +`se' + Northern Sami. + +`sg' + Sango; Sangro. + +`si' + Sinhalese. + +`sk' + Slovak. + +`sl' + Slovenian. + +`sm' + Samoan. + +`sn' + Shona. + +`so' + Somali. + +`sq' + Albanian. + +`sr' + Serbian. + +`ss' + Swati; Siswati. + +`st' + Sesotho; Sotho, Southern. + +`su' + Sundanese. + +`sv' + Swedish. + +`sw' + Swahili. + +`ta' + Tamil. + +`te' + Telugu. + +`tg' + Tajik. + +`th' + Thai. + +`ti' + Tigrinya. + +`tk' + Turkmen. + +`tl' + Tagalog. + +`tn' + Tswana; Setswana. + +`to' + Tonga (?). + +`tr' + Turkish. + +`ts' + Tsonga. + +`tt' + Tatar. + +`tw' + Twi. + +`ty' + Tahitian. + +`ug' + Uighur. + +`uk' + Ukrainian. + +`ur' + Urdu. + +`uz' + Uzbek. + +`vi' + Vietnamese. + +`vo' + Volapu"k; Volapuk. + +`wa' + Walloon. + +`wo' + Wolof. + +`xh' + Xhosa. + +`yi' + Yiddish (formerly ji). + +`yo' + Yoruba. + +`za' + Zhuang. + +`zh' + Chinese. + +`zu' + Zulu. + + +File: gettext.info, Node: Country Codes, Next: Program Index, Prev: Language Codes, Up: Top + +Country Codes +************* + + 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. + +`AD' + Andorra. + +`AE' + United Arab Emirates. + +`AF' + Afghanistan. + +`AG' + Antigua and Barbuda. + +`AI' + Anguilla. + +`AL' + Albania. + +`AM' + Armenia. + +`AN' + Netherlands Antilles. + +`AO' + Angola. + +`AQ' + Antarctica. + +`AR' + Argentina. + +`AS' + Samoa (American). + +`AT' + Austria. + +`AU' + Australia. + +`AW' + Aruba. + +`AZ' + Azerbaijan. + +`BA' + Bosnia and Herzegovina. + +`BB' + Barbados. + +`BD' + Bangladesh. + +`BE' + Belgium. + +`BF' + Burkina Faso. + +`BG' + Bulgaria. + +`BH' + Bahrain. + +`BI' + Burundi. + +`BJ' + Benin. + +`BM' + Bermuda. + +`BN' + Brunei. + +`BO' + Bolivia. + +`BR' + Brazil. + +`BS' + Bahamas. + +`BT' + Bhutan. + +`BV' + Bouvet Island. + +`BW' + Botswana. + +`BY' + Belarus. + +`BZ' + Belize. + +`CA' + Canada. + +`CC' + Cocos (Keeling) Islands. + +`CD' + Congo (Dem. Rep.). + +`CF' + Central African Rep.. + +`CG' + Congo (Rep.). + +`CH' + Switzerland. + +`CI' + Cote d'Ivoire. + +`CK' + Cook Islands. + +`CL' + Chile. + +`CM' + Cameroon. + +`CN' + China. + +`CO' + Colombia. + +`CR' + Costa Rica. + +`CU' + Cuba. + +`CV' + Cape Verde. + +`CX' + Christmas Island. + +`CY' + Cyprus. + +`CZ' + Czech Republic. + +`DE' + Germany. + +`DJ' + Djibouti. + +`DK' + Denmark. + +`DM' + Dominica. + +`DO' + Dominican Republic. + +`DZ' + Algeria. + +`EC' + Ecuador. + +`EE' + Estonia. + +`EG' + Egypt. + +`EH' + Western Sahara. + +`ER' + Eritrea. + +`ES' + Spain. + +`ET' + Ethiopia. + +`FI' + Finland. + +`FJ' + Fiji. + +`FK' + Falkland Islands. + +`FM' + Micronesia. + +`FO' + Faeroe Islands. + +`FR' + France. + +`GA' + Gabon. + +`GB' + Britain (UK). + +`GD' + Grenada. + +`GE' + Georgia. + +`GF' + French Guiana. + +`GH' + Ghana. + +`GI' + Gibraltar. + +`GL' + Greenland. + +`GM' + Gambia. + +`GN' + Guinea. + +`GP' + Guadeloupe. + +`GQ' + Equatorial Guinea. + +`GR' + Greece. + +`GS' + South Georgia and the South Sandwich Islands. + +`GT' + Guatemala. + +`GU' + Guam. + +`GW' + Guinea-Bissau. + +`GY' + Guyana. + +`HK' + Hong Kong. + +`HM' + Heard Island and McDonald Islands. + +`HN' + Honduras. + +`HR' + Croatia. + +`HT' + Haiti. + +`HU' + Hungary. + +`ID' + Indonesia. + +`IE' + Ireland. + +`IL' + Israel. + +`IN' + India. + +`IO' + British Indian Ocean Territory. + +`IQ' + Iraq. + +`IR' + Iran. + +`IS' + Iceland. + +`IT' + Italy. + +`JM' + Jamaica. + +`JO' + Jordan. + +`JP' + Japan. + +`KE' + Kenya. + +`KG' + Kyrgyzstan. + +`KH' + Cambodia. + +`KI' + Kiribati. + +`KM' + Comoros. + +`KN' + St Kitts and Nevis. + +`KP' + Korea (North). + +`KR' + Korea (South). + +`KW' + Kuwait. + +`KY' + Cayman Islands. + +`KZ' + Kazakhstan. + +`LA' + Laos. + +`LB' + Lebanon. + +`LC' + St Lucia. + +`LI' + Liechtenstein. + +`LK' + Sri Lanka. + +`LR' + Liberia. + +`LS' + Lesotho. + +`LT' + Lithuania. + +`LU' + Luxembourg. + +`LV' + Latvia. + +`LY' + Libya. + +`MA' + Morocco. + +`MC' + Monaco. + +`MD' + Moldova. + +`MG' + Madagascar. + +`MH' + Marshall Islands. + +`MK' + Macedonia. + +`ML' + Mali. + +`MM' + Myanmar (Burma). + +`MN' + Mongolia. + +`MO' + Macao. + +`MP' + Northern Mariana Islands. + +`MQ' + Martinique. + +`MR' + Mauritania. + +`MS' + Montserrat. + +`MT' + Malta. + +`MU' + Mauritius. + +`MV' + Maldives. + +`MW' + Malawi. + +`MX' + Mexico. + +`MY' + Malaysia. + +`MZ' + Mozambique. + +`NA' + Namibia. + +`NC' + New Caledonia. + +`NE' + Niger. + +`NF' + Norfolk Island. + +`NG' + Nigeria. + +`NI' + Nicaragua. + +`NL' + Netherlands. + +`NO' + Norway. + +`NP' + Nepal. + +`NR' + Nauru. + +`NU' + Niue. + +`NZ' + New Zealand. + +`OM' + Oman. + +`PA' + Panama. + +`PE' + Peru. + +`PF' + French Polynesia. + +`PG' + Papua New Guinea. + +`PH' + Philippines. + +`PK' + Pakistan. + +`PL' + Poland. + +`PM' + St Pierre and Miquelon. + +`PN' + Pitcairn. + +`PR' + Puerto Rico. + +`PS' + Palestine. + +`PT' + Portugal. + +`PW' + Palau. + +`PY' + Paraguay. + +`QA' + Qatar. + +`RE' + Reunion. + +`RO' + Romania. + +`RU' + Russia. + +`RW' + Rwanda. + +`SA' + Saudi Arabia. + +`SB' + Solomon Islands. + +`SC' + Seychelles. + +`SD' + Sudan. + +`SE' + Sweden. + +`SG' + Singapore. + +`SH' + St Helena. + +`SI' + Slovenia. + +`SJ' + Svalbard and Jan Mayen. + +`SK' + Slovakia. + +`SL' + Sierra Leone. + +`SM' + San Marino. + +`SN' + Senegal. + +`SO' + Somalia. + +`SR' + Suriname. + +`ST' + Sao Tome and Principe. + +`SV' + El Salvador. + +`SY' + Syria. + +`SZ' + Swaziland. + +`TC' + Turks and Caicos Is. + +`TD' + Chad. + +`TF' + French Southern and Antarctic Lands. + +`TG' + Togo. + +`TH' + Thailand. + +`TJ' + Tajikistan. + +`TK' + Tokelau. + +`TM' + Turkmenistan. + +`TN' + Tunisia. + +`TO' + Tonga. + +`TP' + East Timor. + +`TR' + Turkey. + +`TT' + Trinidad and Tobago. + +`TV' + Tuvalu. + +`TW' + Taiwan. + +`TZ' + Tanzania. + +`UA' + Ukraine. + +`UG' + Uganda. + +`UM' + US minor outlying islands. + +`US' + United States. + +`UY' + Uruguay. + +`UZ' + Uzbekistan. + +`VA' + Vatican City. + +`VC' + St Vincent. + +`VE' + Venezuela. + +`VG' + Virgin Islands (UK). + +`VI' + Virgin Islands (US). + +`VN' + Vietnam. + +`VU' + Vanuatu. + +`WF' + Wallis and Futuna. + +`WS' + Samoa (Western). + +`YE' + Yemen. + +`YT' + Mayotte. + +`YU' + Yugoslavia. + +`ZA' + South Africa. + +`ZM' + Zambia. + +`ZW' + Zimbabwe. + + +File: gettext.info, Node: Program Index, Next: Option Index, Prev: Country Codes, Up: Top + +Program Index +************* + +* Menu: + +* gettext <1>: bash. +* gettext: sh. +* gettextize: gettextize Invocation. +* msgattrib: msgattrib Invocation. +* msgcat: msgcat Invocation. +* msgcmp: msgcmp Invocation. +* msgcomm: msgcomm Invocation. +* msgconv: msgconv Invocation. +* msgen: msgen Invocation. +* msgexec: msgexec Invocation. +* msgfilter: msgfilter Invocation. +* msgfmt: msgfmt Invocation. +* msggrep: msggrep Invocation. +* msginit: msginit Invocation. +* msgmerge: msgmerge Invocation. +* msgunfmt: msgunfmt Invocation. +* msguniq: msguniq Invocation. +* ngettext <1>: bash. +* ngettext: sh. +* xgettext: xgettext Invocation. +  File: gettext.info, Node: Option Index, Next: Variable Index, Prev: Program Index, Up: Top @@ -171,6 +1927,18 @@ Option Index * --no-location, xgettext option: xgettext Invocation. * --no-obsolete, msgattrib option: msgattrib Invocation. * --no-translator, msginit option: msginit Invocation. +* --no-wrap, msgattrib option: msgattrib Invocation. +* --no-wrap, msgcat option: msgcat Invocation. +* --no-wrap, msgcomm option: msgcomm Invocation. +* --no-wrap, msgconv option: msgconv Invocation. +* --no-wrap, msgen option: msgen Invocation. +* --no-wrap, msgfilter option: msgfilter Invocation. +* --no-wrap, msggrep option: msggrep Invocation. +* --no-wrap, msginit option: msginit Invocation. +* --no-wrap, msgmerge option: msgmerge Invocation. +* --no-wrap, msgunfmt option: msgunfmt Invocation. +* --no-wrap, msguniq option: msguniq Invocation. +* --no-wrap, xgettext option: xgettext Invocation. * --obsolete, msgattrib option: msgattrib Invocation. * --omit-header, msgcomm option: msgcomm Invocation. * --omit-header, xgettext option: xgettext Invocation. @@ -474,179 +2242,3 @@ Variable Index * TEXTDOMAINDIR, environment variable <1>: bash. * TEXTDOMAINDIR, environment variable: sh. - -File: gettext.info, Node: PO Mode Index, Next: Autoconf Macro Index, Prev: Variable Index, Up: Top - -PO Mode Index -************* - -* Menu: - -* #, PO Mode command: Modifying Comments. -* ,, PO Mode command: Marking. -* ., PO Mode command: Entry Positioning. -* .emacs customizations: Installation. -* 0, PO Mode command: Main PO Commands. -* <, PO Mode command: Entry Positioning. -* =, PO Mode command: Main PO Commands. -* >, PO Mode command: Entry Positioning. -* ?, PO Mode command: Main PO Commands. -* _, PO Mode command: Main PO Commands. -* a, PO Mode command: Auxiliary. -* A, PO Mode command: Auxiliary. -* a, PO Mode command: Auxiliary. -* auxiliary PO file: Auxiliary. -* C-c C-a, PO Mode command <1>: Auxiliary. -* C-c C-a, PO Mode command: Subedit. -* C-c C-c, PO Mode command: Subedit. -* C-c C-k, PO Mode command: Subedit. -* C-j, PO Mode command: Modifying Translations. -* commands: Main PO Commands. -* comment out PO file entry: Obsolete Entries. -* consulting program sources: C Sources Context. -* consulting translations to other languages: Auxiliary. -* current entry of a PO file: Entry Positioning. -* cut and paste for translated strings: Modifying Translations. -* DEL, PO Mode command <1>: Obsolete Entries. -* DEL, PO Mode command: Fuzzy Entries. -* editing comments: Modifying Comments. -* editing multiple entries: Subedit. -* editing translations: Modifying Translations. -* etags, using for marking strings: Marking. -* exiting PO subedit: Subedit. -* find source fragment for a PO file entry: C Sources Context. -* h, PO Mode command: Main PO Commands. -* installing PO mode: Installation. -* K, PO Mode command: Modifying Comments. -* k, PO Mode command <1>: Modifying Translations. -* k, PO Mode command: Untranslated Entries. -* LFD, PO Mode command: Modifying Translations. -* looking at the source to aid translation: C Sources Context. -* m, PO Mode command: Entry Positioning. -* M-,, PO Mode command: Marking. -* M-., PO Mode command: Marking. -* M-A, PO Mode command: Auxiliary. -* M-S, PO Mode command: C Sources Context. -* M-s, PO Mode command: C Sources Context. -* M-S, PO Mode command: C Sources Context. -* M-s, PO Mode command: C Sources Context. -* marking strings for translation: Marking. -* moving by fuzzy entries: Fuzzy Entries. -* moving by obsolete entries: Obsolete Entries. -* moving by translated entries: Translated Entries. -* moving by untranslated entries: Untranslated Entries. -* moving through a PO file: Entry Positioning. -* n, PO Mode command: Entry Positioning. -* next-error, stepping through PO file validation results: Main PO Commands. -* normalize, PO Mode command: Auxiliary. -* O, PO Mode command: Obsolete Entries. -* o, PO Mode command: Obsolete Entries. -* O, PO Mode command: Obsolete Entries. -* o, PO Mode command: Obsolete Entries. -* obsolete active entry: Obsolete Entries. -* p, PO Mode command: Entry Positioning. -* pending subedits: Subedit. -* po-auto-edit-with-msgid, PO Mode variable: Modifying Translations. -* po-auto-fuzzy-on-edit, PO Mode variable: Translated Entries. -* po-auto-select-on-unfuzzy, PO Mode variable: Fuzzy Entries. -* po-confirm-and-quit, PO Mode command: Main PO Commands. -* po-consider-as-auxiliary, PO Mode command: Auxiliary. -* po-consider-source-path, PO Mode command: C Sources Context. -* po-current-entry, PO Mode command: Entry Positioning. -* po-cycle-auxiliary, PO Mode command: Auxiliary. -* po-cycle-source-reference, PO Mode command: C Sources Context. -* po-edit-comment, PO Mode command: Modifying Comments. -* po-edit-msgstr, PO Mode command: Modifying Translations. -* po-exchange-location, PO Mode command: Entry Positioning. -* po-fade-out-entry, PO Mode command <1>: Obsolete Entries. -* po-fade-out-entry, PO Mode command: Fuzzy Entries. -* po-first-entry, PO Mode command: Entry Positioning. -* po-help, PO Mode command: Main PO Commands. -* po-ignore-as-auxiliary, PO Mode command: Auxiliary. -* po-ignore-source-path, PO Mode command: C Sources Context. -* po-kill-comment, PO Mode command: Modifying Comments. -* po-kill-msgstr, PO Mode command <1>: Modifying Translations. -* po-kill-msgstr, PO Mode command: Untranslated Entries. -* po-kill-ring-save-comment, PO Mode command: Modifying Comments. -* po-kill-ring-save-msgstr, PO Mode command: Modifying Translations. -* po-last-entry, PO Mode command: Entry Positioning. -* po-mark-translatable, PO Mode command: Marking. -* po-msgid-to-msgstr, PO Mode command: Modifying Translations. -* po-next-entry, PO Mode command: Entry Positioning. -* po-next-fuzzy-entry, PO Mode command: Fuzzy Entries. -* po-next-obsolete-entry, PO Mode command: Obsolete Entries. -* po-next-translated-entry, PO Mode command: Translated Entries. -* po-next-untranslated-entry, PO Mode command: Untranslated Entries. -* po-normalize, PO Mode command <1>: Normalizing. -* po-normalize, PO Mode command: PO Files. -* po-other-window, PO Mode command: Main PO Commands. -* po-pop-location, PO Mode command: Entry Positioning. -* po-previous-entry, PO Mode command: Entry Positioning. -* po-previous-fuzzy-entry, PO Mode command: Fuzzy Entries. -* po-previous-obsolete-entry, PO Mode command: Obsolete Entries. -* po-previous-translated-entry, PO Mode command: Translated Entries. -* po-previous-untransted-entry, PO Mode command: Untranslated Entries. -* po-push-location, PO Mode command: Entry Positioning. -* po-quit, PO Mode command: Main PO Commands. -* po-select-auxiliary, PO Mode command: Auxiliary. -* po-select-mark-and-mark, PO Mode command: Marking. -* po-select-source-reference, PO Mode command: C Sources Context. -* po-statistics, PO Mode command: Main PO Commands. -* po-subedit-abort, PO Mode command: Subedit. -* po-subedit-cycle-auxiliary, PO Mode command: Subedit. -* po-subedit-exit, PO Mode command: Subedit. -* po-subedit-mode-hook, PO Mode variable: Modifying Comments. -* po-tags-search, PO Mode command: Marking. -* po-undo, PO Mode command: Main PO Commands. -* po-unfuzzy, PO Mode command: Fuzzy Entries. -* po-validate, PO Mode command: Main PO Commands. -* po-yank-comment, PO Mode command: Modifying Comments. -* po-yank-msgstr, PO Mode command: Modifying Translations. -* q, PO Mode command: Main PO Commands. -* Q, PO Mode command: Main PO Commands. -* q, PO Mode command: Main PO Commands. -* Q, PO Mode command: Main PO Commands. -* r, PO Mode command: Entry Positioning. -* RET, PO Mode command: Modifying Translations. -* S, PO Mode command: C Sources Context. -* s, PO Mode command: C Sources Context. -* S, PO Mode command: C Sources Context. -* s, PO Mode command: C Sources Context. -* starting a string translation: Modifying Translations. -* string normalization in entries: Normalizing. -* subedit minor mode: Subedit. -* T, PO Mode command: Translated Entries. -* t, PO Mode command: Translated Entries. -* T, PO Mode command: Translated Entries. -* t, PO Mode command: Translated Entries. -* TAB, PO Mode command: Fuzzy Entries. -* TAGS, and marking translatable strings: Marking. -* U, PO Mode command: Untranslated Entries. -* u, PO Mode command: Untranslated Entries. -* U, PO Mode command: Untranslated Entries. -* u, PO Mode command: Untranslated Entries. -* use the source, Luke: C Sources Context. -* using obsolete translations to make new entries: Modifying Translations. -* using translation compendia: Compendium. -* V, PO Mode command: Main PO Commands. -* W, PO Mode command: Modifying Comments. -* w, PO Mode command: Modifying Translations. -* x, PO Mode command: Entry Positioning. -* Y, PO Mode command: Modifying Comments. -* y, PO Mode command: Modifying Translations. -* Z, PO Mode command: Fuzzy Entries. -* z, PO Mode command: Fuzzy Entries. -* Z, PO Mode command: Fuzzy Entries. -* z, PO Mode command: Fuzzy Entries. - - -File: gettext.info, Node: Autoconf Macro Index, Next: Index, Prev: PO Mode Index, Up: Top - -Autoconf Macro Index -******************** - -* Menu: - -* AM_GNU_GETTEXT: AM_GNU_GETTEXT. -* AM_ICONV: AM_ICONV. - diff --git a/doc/gettext.info-9 b/doc/gettext.info-9 index 24331eb05..c1b4e01d9 100644 --- a/doc/gettext.info-9 +++ b/doc/gettext.info-9 @@ -30,6 +30,182 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. + +File: gettext.info, Node: PO Mode Index, Next: Autoconf Macro Index, Prev: Variable Index, Up: Top + +PO Mode Index +************* + +* Menu: + +* #, PO Mode command: Modifying Comments. +* ,, PO Mode command: Marking. +* ., PO Mode command: Entry Positioning. +* .emacs customizations: Installation. +* 0, PO Mode command: Main PO Commands. +* <, PO Mode command: Entry Positioning. +* =, PO Mode command: Main PO Commands. +* >, PO Mode command: Entry Positioning. +* ?, PO Mode command: Main PO Commands. +* _, PO Mode command: Main PO Commands. +* a, PO Mode command: Auxiliary. +* A, PO Mode command: Auxiliary. +* a, PO Mode command: Auxiliary. +* auxiliary PO file: Auxiliary. +* C-c C-a, PO Mode command <1>: Auxiliary. +* C-c C-a, PO Mode command: Subedit. +* C-c C-c, PO Mode command: Subedit. +* C-c C-k, PO Mode command: Subedit. +* C-j, PO Mode command: Modifying Translations. +* commands: Main PO Commands. +* comment out PO file entry: Obsolete Entries. +* consulting program sources: C Sources Context. +* consulting translations to other languages: Auxiliary. +* current entry of a PO file: Entry Positioning. +* cut and paste for translated strings: Modifying Translations. +* DEL, PO Mode command <1>: Obsolete Entries. +* DEL, PO Mode command: Fuzzy Entries. +* editing comments: Modifying Comments. +* editing multiple entries: Subedit. +* editing translations: Modifying Translations. +* etags, using for marking strings: Marking. +* exiting PO subedit: Subedit. +* find source fragment for a PO file entry: C Sources Context. +* h, PO Mode command: Main PO Commands. +* installing PO mode: Installation. +* K, PO Mode command: Modifying Comments. +* k, PO Mode command <1>: Modifying Translations. +* k, PO Mode command: Untranslated Entries. +* LFD, PO Mode command: Modifying Translations. +* looking at the source to aid translation: C Sources Context. +* m, PO Mode command: Entry Positioning. +* M-,, PO Mode command: Marking. +* M-., PO Mode command: Marking. +* M-A, PO Mode command: Auxiliary. +* M-S, PO Mode command: C Sources Context. +* M-s, PO Mode command: C Sources Context. +* M-S, PO Mode command: C Sources Context. +* M-s, PO Mode command: C Sources Context. +* marking strings for translation: Marking. +* moving by fuzzy entries: Fuzzy Entries. +* moving by obsolete entries: Obsolete Entries. +* moving by translated entries: Translated Entries. +* moving by untranslated entries: Untranslated Entries. +* moving through a PO file: Entry Positioning. +* n, PO Mode command: Entry Positioning. +* next-error, stepping through PO file validation results: Main PO Commands. +* normalize, PO Mode command: Auxiliary. +* O, PO Mode command: Obsolete Entries. +* o, PO Mode command: Obsolete Entries. +* O, PO Mode command: Obsolete Entries. +* o, PO Mode command: Obsolete Entries. +* obsolete active entry: Obsolete Entries. +* p, PO Mode command: Entry Positioning. +* pending subedits: Subedit. +* po-auto-edit-with-msgid, PO Mode variable: Modifying Translations. +* po-auto-fuzzy-on-edit, PO Mode variable: Translated Entries. +* po-auto-select-on-unfuzzy, PO Mode variable: Fuzzy Entries. +* po-confirm-and-quit, PO Mode command: Main PO Commands. +* po-consider-as-auxiliary, PO Mode command: Auxiliary. +* po-consider-source-path, PO Mode command: C Sources Context. +* po-current-entry, PO Mode command: Entry Positioning. +* po-cycle-auxiliary, PO Mode command: Auxiliary. +* po-cycle-source-reference, PO Mode command: C Sources Context. +* po-edit-comment, PO Mode command: Modifying Comments. +* po-edit-msgstr, PO Mode command: Modifying Translations. +* po-exchange-location, PO Mode command: Entry Positioning. +* po-fade-out-entry, PO Mode command <1>: Obsolete Entries. +* po-fade-out-entry, PO Mode command: Fuzzy Entries. +* po-first-entry, PO Mode command: Entry Positioning. +* po-help, PO Mode command: Main PO Commands. +* po-ignore-as-auxiliary, PO Mode command: Auxiliary. +* po-ignore-source-path, PO Mode command: C Sources Context. +* po-kill-comment, PO Mode command: Modifying Comments. +* po-kill-msgstr, PO Mode command <1>: Modifying Translations. +* po-kill-msgstr, PO Mode command: Untranslated Entries. +* po-kill-ring-save-comment, PO Mode command: Modifying Comments. +* po-kill-ring-save-msgstr, PO Mode command: Modifying Translations. +* po-last-entry, PO Mode command: Entry Positioning. +* po-mark-translatable, PO Mode command: Marking. +* po-msgid-to-msgstr, PO Mode command: Modifying Translations. +* po-next-entry, PO Mode command: Entry Positioning. +* po-next-fuzzy-entry, PO Mode command: Fuzzy Entries. +* po-next-obsolete-entry, PO Mode command: Obsolete Entries. +* po-next-translated-entry, PO Mode command: Translated Entries. +* po-next-untranslated-entry, PO Mode command: Untranslated Entries. +* po-normalize, PO Mode command <1>: Normalizing. +* po-normalize, PO Mode command: PO Files. +* po-other-window, PO Mode command: Main PO Commands. +* po-pop-location, PO Mode command: Entry Positioning. +* po-previous-entry, PO Mode command: Entry Positioning. +* po-previous-fuzzy-entry, PO Mode command: Fuzzy Entries. +* po-previous-obsolete-entry, PO Mode command: Obsolete Entries. +* po-previous-translated-entry, PO Mode command: Translated Entries. +* po-previous-untransted-entry, PO Mode command: Untranslated Entries. +* po-push-location, PO Mode command: Entry Positioning. +* po-quit, PO Mode command: Main PO Commands. +* po-select-auxiliary, PO Mode command: Auxiliary. +* po-select-mark-and-mark, PO Mode command: Marking. +* po-select-source-reference, PO Mode command: C Sources Context. +* po-statistics, PO Mode command: Main PO Commands. +* po-subedit-abort, PO Mode command: Subedit. +* po-subedit-cycle-auxiliary, PO Mode command: Subedit. +* po-subedit-exit, PO Mode command: Subedit. +* po-subedit-mode-hook, PO Mode variable: Modifying Comments. +* po-tags-search, PO Mode command: Marking. +* po-undo, PO Mode command: Main PO Commands. +* po-unfuzzy, PO Mode command: Fuzzy Entries. +* po-validate, PO Mode command: Main PO Commands. +* po-yank-comment, PO Mode command: Modifying Comments. +* po-yank-msgstr, PO Mode command: Modifying Translations. +* q, PO Mode command: Main PO Commands. +* Q, PO Mode command: Main PO Commands. +* q, PO Mode command: Main PO Commands. +* Q, PO Mode command: Main PO Commands. +* r, PO Mode command: Entry Positioning. +* RET, PO Mode command: Modifying Translations. +* S, PO Mode command: C Sources Context. +* s, PO Mode command: C Sources Context. +* S, PO Mode command: C Sources Context. +* s, PO Mode command: C Sources Context. +* starting a string translation: Modifying Translations. +* string normalization in entries: Normalizing. +* subedit minor mode: Subedit. +* T, PO Mode command: Translated Entries. +* t, PO Mode command: Translated Entries. +* T, PO Mode command: Translated Entries. +* t, PO Mode command: Translated Entries. +* TAB, PO Mode command: Fuzzy Entries. +* TAGS, and marking translatable strings: Marking. +* U, PO Mode command: Untranslated Entries. +* u, PO Mode command: Untranslated Entries. +* U, PO Mode command: Untranslated Entries. +* u, PO Mode command: Untranslated Entries. +* use the source, Luke: C Sources Context. +* using obsolete translations to make new entries: Modifying Translations. +* using translation compendia: Compendium. +* V, PO Mode command: Main PO Commands. +* W, PO Mode command: Modifying Comments. +* w, PO Mode command: Modifying Translations. +* x, PO Mode command: Entry Positioning. +* Y, PO Mode command: Modifying Comments. +* y, PO Mode command: Modifying Translations. +* Z, PO Mode command: Fuzzy Entries. +* z, PO Mode command: Fuzzy Entries. +* Z, PO Mode command: Fuzzy Entries. +* z, PO Mode command: Fuzzy Entries. + + +File: gettext.info, Node: Autoconf Macro Index, Next: Index, Prev: PO Mode Index, Up: Top + +Autoconf Macro Index +******************** + +* Menu: + +* AM_GNU_GETTEXT: AM_GNU_GETTEXT. +* AM_ICONV: AM_ICONV. +  File: gettext.info, Node: Index, Prev: Autoconf Macro Index, Up: Top @@ -45,6 +221,7 @@ General Index * accumulating translations: Creating Compendia. * aclocal.m4 file: aclocal. * adding keywords, xgettext: xgettext Invocation. +* ambiguities: Preparing Strings. * apply a filter to translations: msgfilter Invocation. * apply command to all translations in a catalog: msgexec Invocation. * attribute manipulation: msgattrib Invocation. @@ -87,6 +264,7 @@ General Index * compendium, creating: Creating Compendia. * concatenate PO files: msgcat Invocation. * concatenating PO files into a compendium: Creating Compendia. +* concatenation of strings: Preparing Strings. * convert binary message catalog into PO file: msgunfmt Invocation. * convert translations to a different encoding: msgconv Invocation. * converting a package to use gettext: Prerequisites. @@ -140,6 +318,7 @@ General Index * hash table, inside MO files: MO Files. * he, she, and they: Introduction. * header entry of a PO file: Header Entry. +* help option: Preparing Strings. * history of GNU gettext: History. * i18n: Concepts. * importing PO files: Normalizing. @@ -153,11 +332,13 @@ General Index * installing gettext: Installation. * interface to catgets: Interface to catgets. * internationalization: Concepts. +* inttypes.h: Preparing Strings. * ISO 3166: Country Codes. * ISO 639: Language Codes. * Java: Java. * Java mode, and msgfmt program: msgfmt Invocation. * Java mode, and msgunfmt program: msgunfmt Invocation. +* Java, string concatenation: Preparing Strings. * keyboard accelerator checking: msgfmt Invocation. * l10n: Concepts. * language codes: Language Codes. @@ -196,6 +377,7 @@ General Index * manipulating PO files: Manipulating. * marking string initializers: Special cases. * marking strings that require translation: Mark Keywords. +* marking strings, preparations: Preparing Strings. * marking translatable strings: Overview. * menu entries: GUI program problems. * menu, keyboard accelerator support: msgfmt Invocation. @@ -245,6 +427,7 @@ General Index * package and version declaration in configure.in: configure.in. * package build and installation options: Installers. * package maintainer's view of gettext: Maintainers. +* paragraphs: Preparing Strings. * Pascal: Pascal. * Perl: Perl. * PHP: PHP. @@ -270,6 +453,7 @@ General Index * scripting languages: Language Implementors. * search messages in a catalog: msggrep Invocation. * selecting message language: End Users. +* sentences: Preparing Strings. * setting up gettext at build time: Installers. * setting up gettext at run time: End Users. * several domains: Ambiguities. @@ -285,7 +469,9 @@ General Index * specifying plural form in a PO file: Plural forms. * standard output, and msgcat: msgcat Invocation. * standard output, and msgmerge program: msgmerge Invocation. +* string concatenation: Preparing Strings. * string normalization in entries: Normalizing. +* style: Preparing Strings. * supported languages, xgettext: xgettext Invocation. * Tcl: Tcl. * Tcl mode, and msgfmt program: msgfmt Invocation. diff --git a/doc/gettext_1.html b/doc/gettext_1.html index 3e96db0ee..3fa9b03e0 100644 --- a/doc/gettext_1.html +++ b/doc/gettext_1.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 1 Introduction @@ -176,7 +176,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 10 The Programmer's View. +GNU gettext offers one of these standards. See section 10 The Programmer's View.

@@ -557,10 +557,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 4.1 Invoking the xgettext Program, for more details about how one calls the +See section 4.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 12 The Maintainer's View). By doing so, you +whole distribution setup (see section 12 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! @@ -569,7 +569,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 5 Creating a New PO File for details. +represents the target language. See section 5 Creating a New PO File for details.

@@ -577,7 +577,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 11 The Translator's View). You will also find there indications +manual (see section 11 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. @@ -594,14 +594,14 @@ of PO file format are taken care of for you, but you have to acquire some familiarity with PO mode itself. Besides main PO mode commands (see section 2.3 Main PO mode Commands), you should know how to move between entries (see section 2.4 Entry Positioning), and how to handle untranslated entries -(see section 6.4 Untranslated Entries). +(see section 6.4 Untranslated Entries).

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 6.11 Using Translation Compendia). Compendium files +the compendium, updating it (see section 6.11 Using Translation Compendia). Compendium files are meant to be exchanged between members of a given translation team.

@@ -647,8 +647,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 6.5 Obsolete Entries). It finally discovers new strings and inserts them in -the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what +which are no longer used in the program sources (see section 6.5 Obsolete Entries). It finally discovers new strings and inserts them in +the resulting PO file as untranslated entries (see section 6.4 Untranslated Entries). See section 6.1 Invoking the msgmerge Program, for more information about what msgmerge really does.

@@ -678,7 +678,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 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution +package, whenever needed at runtime (see section 8.3 The Format of GNU MO Files). See section 8.1 Invoking the msgfmt Program, for more information about all modes of execution for the msgfmt program.

@@ -688,7 +688,7 @@ 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 9.3 Magic for End Users), the +appropriate environment variables are set (see section 9.3 Magic for End Users), the program should localize itself automatically, whenever it executes.

diff --git a/doc/gettext_10.html b/doc/gettext_10.html index 9015f50d3..09949bbfc 100644 --- a/doc/gettext_10.html +++ b/doc/gettext_10.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 10 The Programmer's View @@ -10,7 +10,7 @@ Go to the first, previous<

-

10 The Programmer's View

+

10 The Programmer's View

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

10.1 About catgets

+

10.1 About catgets

- +

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

10.1.1 The Interface

+

10.1.1 The Interface

- +

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

- + catopen is used like in this:

@@ -97,7 +97,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: @@ -129,7 +129,7 @@ should better be const char *, but the standard is published in

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

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

-

10.1.2 Problems with the catgets Interface?!

+

10.1.2 Problems with the catgets Interface?!

- +

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

-

10.2 About gettext

+

10.2 About gettext

- +

@@ -182,7 +182,7 @@ The main points 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 so many task, 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 10.3 Comparing the Two Interfaces for a more +itself (how long or short it is). See section 10.3 Comparing the Two Interfaces for a more detailed comparison of the two methods.

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

10.2.1 The Interface

+

10.2.1 The Interface

- +

@@ -267,11 +267,11 @@ your language.

-

10.2.2 Solving Ambiguities

+

10.2.2 Solving Ambiguities

- - - + + +

@@ -345,9 +345,9 @@ unreliabilities.

-

10.2.3 Locating Message Catalog Files

+

10.2.3 Locating Message Catalog Files

- +

@@ -385,10 +385,10 @@ The value of the locale is determined through

-

10.2.4 How to specify the output character set gettext uses

+

10.2.4 How to specify the output character set gettext uses

- - + +

@@ -420,7 +420,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 @@ -452,9 +452,9 @@ global variable errno is set accordingly.

-

10.2.5 Additional functions for plural forms

+

10.2.5 Additional functions for plural forms

- +

@@ -574,7 +574,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 @@ -604,7 +604,7 @@ Please note that the numeric value n has to be passed to the

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 @@ -615,7 +615,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 @@ -640,9 +640,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: @@ -668,7 +668,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 @@ -876,11 +876,11 @@ Slovenian -

10.2.6 How to use gettext in GUI programs

+

10.2.6 How to use gettext in GUI programs

- - - + + +

@@ -957,7 +957,7 @@ fine:

- + 

   char *
@@ -1032,9 +1032,9 @@ quite some memory and disk space by doing this.
 

 
 
-
10.2.7  Optimization of the *gettext functions

+
10.2.7  Optimization of the *gettext functions

 

-
+
 
 

 

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

 
 
-
10.3  Comparing the Two Interfaces

+
10.3  Comparing the Two Interfaces

 

-
-
+
+
 
 

 
@@ -1140,7 +1140,7 @@ by
 
 

 

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

 

-
+
 The same procedure can be done for the gettext_noop invocations
-(see section 3.5  Special Cases of Translatable Strings).  One usually defines gettext_noop as a
+(see section 3.6  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:
 
 

@@ -1234,12 +1234,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 10.2.2  Solving Ambiguities.
+of this kind: See section 10.2.2  Solving Ambiguities.
 
 

 
 
-
10.4  Using libintl.a in own programs

+
10.4  Using libintl.a in own programs

 
 

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

 
 
-
10.5  Being a gettext grok

+
10.5  Being a gettext grok

 
 

 To fully exploit the functionality of the GNU gettext library it
@@ -1263,7 +1263,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
@@ -1280,20 +1280,20 @@ priority:
 
      
 
    1. LANGUAGE
 
-
+
  
-
+
 
    2. LC_ALL
 
-
-
-
-
-
-
+
+
+
+
+
+
 
    3. LC_xxx, according to selected locale
 
-
+
 
    4. LANG
 
 
    
@@ -1311,7 +1311,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 10.2.7  Optimization of the *gettext functions).  A
+LANGUAGE variable be changed (see section 10.2.7  Optimization of the *gettext functions).  A
 solution for this is very easy.  Include the following code in the
 language switching function.
 
@@ -1327,7 +1327,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
@@ -1337,11 +1337,11 @@ system's native gettext implementation.
 
 
 
-
10.6  Temporary Notes for the Programmers Chapter

+
10.6  Temporary Notes for the Programmers Chapter

 
 
 
-
10.6.1  Temporary - Two Possible Implementations

+
10.6.1  Temporary - Two Possible Implementations

 
 

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

 
 
-
10.6.2  Temporary - About catgets

+
10.6.2  Temporary - About catgets

 
 

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

 
 
-
10.6.3  Temporary - Why a single implementation

+
10.6.3  Temporary - Why a single implementation

 
 

 Now it seems kind of wasteful to me to have two different systems
@@ -1463,7 +1463,7 @@ the future.
 

 
 
-
10.6.4  Temporary - Notes

+
10.6.4  Temporary - Notes

 
 

 X/Open agreed very late on the standard form so that many
diff --git a/doc/gettext_11.html b/doc/gettext_11.html
index eec39cdc8..66baaee52 100644
--- a/doc/gettext_11.html
+++ b/doc/gettext_11.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 24 April 2002 -->
 
 GNU gettext utilities - 11  The Translator's View
 
@@ -10,11 +10,11 @@ Go to the first, previous
 

 
 
-
11  The Translator's View

+
11  The Translator's View

 
 
 
-
11.1  Introduction 0

+
11.1  Introduction 0

 
 

 Free software is going international!  The Translation Project is a way
@@ -92,7 +92,7 @@ you can work on.
 

 
 
-
11.2  Introduction 1

+
11.2  Introduction 1

 
 

 This is now official, GNU is going international!  Here is the
@@ -142,7 +142,7 @@ document, please e-mail to `translation@iro.umontreal.ca´.
 

 
 
-
11.3  Discussions

+
11.3  Discussions

 
 

 Facing this internationalization effort, a few users expressed their
@@ -219,7 +219,7 @@ software.
 
 
 
-
11.4  Organization

+
11.4  Organization

 
 

 On a larger scale, the true solution would be to organize some kind of
@@ -263,7 +263,7 @@ reaches the Translation Project coordinator.
 
 
 
-
11.4.1  Central Coordination

+
11.4.1  Central Coordination

 
 

 I also think GNU will need sooner than it thinks, that someone setup
@@ -288,7 +288,7 @@ overwhelming task, the time to put delegations in place.
 

 
 
-
11.4.2  National Teams

+
11.4.2  National Teams

 
 

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

+
11.4.2.1  Sub-Cultures

 
 

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

 
 
-
11.4.2.2  Organizational Ideas

+
11.4.2.2  Organizational Ideas

 
 

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

+
11.4.3  Mailing Lists

 
 

 If we get any inquiries about GNU gettext, send them on to:
@@ -464,7 +464,7 @@ subscribe as they see fit, as long as each team is represented in it.
 

 
 
-
11.5  Information Flow

+
11.5  Information Flow

 
 

 There will surely be some discussion about this messages after the
diff --git a/doc/gettext_12.html b/doc/gettext_12.html
index d05ce12fd..b29f5ec26 100644
--- a/doc/gettext_12.html
+++ b/doc/gettext_12.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 24 April 2002 -->
 
 GNU gettext utilities - 12  The Maintainer's View
 
@@ -10,15 +10,15 @@ Go to the first, previous
 

 
 
-
12  The Maintainer's View

+
12  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 that the magic we described earlier (see section 9  The User's View) will work
+and that the magic we described earlier (see section 9  The User's View) will work
 for installers and end users.
 
 

@@ -52,7 +52,7 @@ for changes.
 
 
 
-
12.1  Flat or Non-Flat Directory Structures

+
12.1  Flat or Non-Flat Directory Structures

 
 

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

 
 
-
12.2  Prerequisite Works

+
12.2  Prerequisite Works

 

-
-
-
+
+
+
 
 

 

@@ -186,7 +186,7 @@ never try to solve a team's problem on your own.
 

 
 
-
12.3  Invoking the gettextize Program

+
12.3  Invoking the gettextize Program

 
 

 Some files are consistently and identically needed in every package
@@ -196,8 +196,8 @@ in your package.  This program has the following synopsis:
 
 

 

-
-
+
+
 
 
 gettextize [ option... ] [ directory ]
@@ -213,8 +213,8 @@ and accepts the following options:
 

 
`--copy´
 

-
-
+
+
 Copy the needed files instead of making symbolic links.  Using links
 would allow the package to always use the latest gettext code
 available on the system, but it might disturb some mechanism the
@@ -225,13 +225,13 @@ maintainer is used to apply to the sources.  Because running
 

 
`--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,
@@ -241,19 +241,19 @@ be enabled on systems lacking GNU gettext.
 
 
`--no-changelog´
 

-
+
 Don't update or create ChangeLog files.  By default, gettextize
 logs all changes (file additions, modifications ans removals) in a
 file called `ChangeLog´ in each affected directory.
 
 
`--help´
 

-
+
 Display this help and exit.
 
 
`--version´
 

-
+
 Output version information and exit.
@@ -335,9 +335,9 @@ it can be identical in all packages.

-

12.4 Files You Must Create or Alter

+

12.4 Files You Must Create or Alter

- +

@@ -352,7 +352,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.11.1 distribution itself, or from the GNU +gettext 0.11.2 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 @@ -363,9 +363,9 @@ gettext functionality. -

12.4.1 `POTFILES.in´ in `po/´

+

12.4.1 `POTFILES.in´ in `po/´

- +

@@ -394,16 +394,24 @@ 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 3.2 How Marks Appear in Sources), in a notation relative to the top level +(see section 3.3 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.

+

+When a C file is automatically generated by a tool, like flex or +bison, that doesn't introduce translatable strings by itself, +it is recommended to list in `po/POTFILES.in´ the real source file +(ending in `.l´ in the case of flex, or in `.y´ in the +case of bison), not the generated C file. +

-

12.4.2 `LINGUAS´ in `po/´

+ +

12.4.2 `LINGUAS´ in `po/´

- +

@@ -425,14 +433,14 @@ 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 9.2 Magic for Installers). +(see section 9.2 Magic for Installers).

-

12.4.3 `Makefile´ pieces in `po/´

+

12.4.3 `Makefile´ pieces in `po/´

- +

@@ -452,8 +460,8 @@ needing to mess 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 @@ -471,7 +479,7 @@ GUI programs. To enable it, similarly add en@boldquot to the

-

12.4.4 `configure.in´ at top level

+

12.4.4 `configure.in´ at top level

`configure.in´ or `configure.ac´ - this is the source from which @@ -482,14 +490,14 @@ GUI programs. To enable it, similarly add en@boldquot to the

  1. Declare the package and version. - + This is done by a set of lines like these: 
     PACKAGE=gettext
-VERSION=0.11.1
+VERSION=0.11.2
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -500,13 +508,13 @@ or, if you are using GNU automake, by a line like this:
 
 
 
    -AM_INIT_AUTOMAKE(gettext, 0.11.1)
+AM_INIT_AUTOMAKE(gettext, 0.11.2)
 
    
 
 Of course, you replace `gettext´ with the name of your package,
-and `0.11.1´ by its version numbers, exactly as they
+and `0.11.2´ by its version numbers, exactly as they
 should appear in the packaged tar file name of your distribution
-(`gettext-0.11.1.tar.gz´, here).
+(`gettext-0.11.2.tar.gz´, here).
 
 
  2. Check for internationalization support.
 
@@ -553,7 +561,7 @@ add intl/Makefile to the AC_OUTPUT line.
 
 
 
-
    12.4.5  `config.guess´, `config.sub´ at top level
    
+
    12.4.5  `config.guess´, `config.sub´ at top level
    
 
 
    
 If you haven't suppressed the `intl/´ subdirectory,
@@ -587,9 +595,9 @@ AC_CONFIG_AUX_DIR([subdir])
 
 
 
-
    12.4.6  `aclocal.m4´ at top level
    
+
    12.4.6  `aclocal.m4´ at top level
    
 
    
-
+
 
 
    
 
    
@@ -639,9 +647,9 @@ piece of m4 code will be the same for all projects using GNU
 
    
 
 
-
    12.4.7  `acconfig.h´ at top level
    
+
    12.4.7  `acconfig.h´ at top level
    
 
    
-
+
 
 
    
 
    
@@ -655,7 +663,7 @@ independently from the `intl/´ directory.
 
    
 
 
-
    12.4.8  `Makefile.in´ at top level
    
+
    12.4.8  `Makefile.in´ at top level
    
 
 
    
 Here are a few modifications you need to make to your main, top-level
@@ -742,7 +750,7 @@ to `Makefile.am´ are already made by running `gettextize&ac
 
    
 
 
-
    12.4.9  `Makefile.in´ in `src/´
    
+
    12.4.9  `Makefile.in´ in `src/´
    
 
 
    
 Some of the modifications made in the main `Makefile.in´ will
@@ -862,11 +870,11 @@ dist: Makefile $(DISTFILES)
 
 
 
-
    12.4.10  `gettext.h´ in `lib/´
    
+
    12.4.10  `gettext.h´ in `lib/´
    
 
    
-
-
-
+
+
+
 
 
    
 
    
@@ -903,7 +911,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
@@ -942,9 +950,9 @@ package that needs it should contain a copy of it on its own.
 
    
 
 
-
    12.5  Autoconf macros for use in `configure.in´
    
+
    12.5  Autoconf macros for use in `configure.in´
    
 
    
-
+
 
 
    
 
    
@@ -957,10 +965,10 @@ The primary macro is, of course, AM_GNU_GETTEXT.
 
 
 
-
    12.5.1  AM_GNU_GETTEXT in `gettext.m4´
    
+
    12.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
@@ -1023,7 +1031,7 @@ The complexities that AM_GNU_GETTEXT deals with are the following:
-

13.5.11 GNU awk

+

13.5.11 GNU awk

- - + +

@@ -1023,11 +1023,11 @@ yourself. -

13.5.12 Pascal - Free Pascal Compiler

+

13.5.12 Pascal - Free Pascal Compiler

- - - + + +

@@ -1099,9 +1099,9 @@ using the TranslateResourceStrings function in the gettext -

13.5.13 wxWindows library

+

13.5.13 wxWindows library

- +

@@ -1165,10 +1165,10 @@ yes -

13.5.14 YCP - YaST2 scripting language

+

13.5.14 YCP - YaST2 scripting language

- - + +

@@ -1232,10 +1232,10 @@ fully portable -

13.5.15 Tcl - Tk's scripting language

+

13.5.15 Tcl - Tk's scripting language

- - + +

@@ -1313,9 +1313,9 @@ argument is given.

-

13.5.16 Perl

+

13.5.16 Perl

- +

@@ -1380,9 +1380,9 @@ use -

13.5.17 PHP Hypertext Preprocessor

+

13.5.17 PHP Hypertext Preprocessor

- +

@@ -1446,9 +1446,9 @@ On platforms without gettext, the functions are not available. -

13.5.18 Pike

+

13.5.18 Pike

- +

@@ -1512,7 +1512,7 @@ On platforms without gettext, the functions are not available. -

13.6 Internationalizable Data

+

13.6 Internationalizable Data

Here is a list of other data formats which can be internationalized @@ -1522,7 +1522,7 @@ using GNU gettext. -

13.6.1 POT - Portable Object Template

+

13.6.1 POT - Portable Object Template

@@ -1541,9 +1541,9 @@ gettext -

13.6.2 Resource String Table

+

13.6.2 Resource String Table

- +

@@ -1563,7 +1563,7 @@ fpk -

13.6.3 Glade - GNOME user interface description

+

13.6.3 Glade - GNOME user interface description

diff --git a/doc/gettext_14.html b/doc/gettext_14.html index 15fe7aa63..e31698ee9 100644 --- a/doc/gettext_14.html +++ b/doc/gettext_14.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 14 Concluding Remarks @@ -10,7 +10,7 @@ Go to the first, previous

-

14 Concluding Remarks

+

14 Concluding Remarks

We would like to conclude this GNU gettext manual by presenting @@ -22,9 +22,9 @@ about Native Language Support matters. -

14.1 History of GNU gettext

+

14.1 History of GNU gettext

- +

@@ -121,10 +121,10 @@ manipulating PO files.

-

14.2 Related Readings

+

14.2 Related Readings

- - + +

diff --git a/doc/gettext_15.html b/doc/gettext_15.html index c5e280cea..d3e3bbd07 100644 --- a/doc/gettext_15.html +++ b/doc/gettext_15.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - A Language Codes @@ -10,10 +10,10 @@ Go to the first, previous

-

A Language Codes

+

A Language Codes

- - + +

@@ -201,6 +201,9 @@ Interlingue.

`ik´
Inupiak. +
`io´ +
+Ido.
`is´
Icelandic. @@ -213,7 +216,7 @@ Inuktitut.
`ja´
Japanese. -
`jw´ +
`jv´
Javanese.
`ka´ @@ -498,6 +501,9 @@ Vietnamese.
`vo´
Volapük; Volapuk. +
`wa´ +
+Walloon.
`wo´
Wolof. diff --git a/doc/gettext_16.html b/doc/gettext_16.html index 6ac89be64..98288dcd0 100644 --- a/doc/gettext_16.html +++ b/doc/gettext_16.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - B Country Codes @@ -10,10 +10,10 @@ Go to the first, previous

-

B Country Codes

+

B Country Codes

- - + +

diff --git a/doc/gettext_17.html b/doc/gettext_17.html index d6757e3ec..dd06ecb50 100644 --- a/doc/gettext_17.html +++ b/doc/gettext_17.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Program Index @@ -10,7 +10,7 @@ Go to the first, previous

-

Program Index

+

Program Index

Jump to: @@ -24,33 +24,33 @@ Jump to:

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

    • x

    -
  • xgettext +
  • xgettext

    • diff --git a/doc/gettext_18.html b/doc/gettext_18.html index 168539928..7a6773e6c 100644 --- a/doc/gettext_18.html +++ b/doc/gettext_18.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Option Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Option Index

    +

    Option Index

    Jump to: @@ -18,414 +18,426 @@ 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 -
  • --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 -
  • --compendium, msgmerge option -
  • --copy, gettextize option -
  • --copyright-holder, xgettext 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, msggrep option -
  • --exclude-file, xgettext option -
  • --expression, msgfilter option -
  • --extended-regexp, msggrep option -
  • --extract-all, xgettext option -
  • --file, msgfilter option -
  • --file, msggrep option -
  • --files-from, msgcat option -
  • --files-from, msgcomm option -
  • --files-from, xgettext option -
  • --fixed-strings, msggrep 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 -
  • --fuzzy, msgattrib 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, xgettext option -
  • --ignore-case, msggrep 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 -
  • --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, msginit option -
  • --locale, msgunfmt option, --locale, msgunfmt option -
  • --location, msggrep option -
  • --more-than, msgcat option -
  • --more-than, msgcomm option -
  • --msgid, msggrep 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-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 -
  • --obsolete, msgattrib option -
  • --omit-header, msgcomm option -
  • --omit-header, xgettext 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 -
  • --quiet, msgfilter option -
  • --quiet, msgmerge option -
  • --regexp=, msggrep option -
  • --repeated, msguniq option -
  • --resource, msgfmt 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 -
  • --suffix, msgmerge 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, msgfmt option -
  • --verbose, msgfmt option -
  • --verbose, msgmerge option -
  • --verbose, msgunfmt 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, 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, gettextize option -
  • -c, msgfmt option -
  • -C, msgfmt option -
  • -C, msgmerge option -
  • -C, xgettext option -
  • -c, xgettext 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, msggrep option -
  • -D, msgmerge option -
  • -d, msgunfmt option -
  • -d, msguniq option -
  • -D, msguniq option -
  • -D, xgettext option -
  • -d, xgettext option -
  • -e, msgfilter option -
  • -E, msggrep option -
  • -e, msggrep 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, 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, 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, msgunfmt option -
  • -j, xgettext option -
  • -K, msggrep option -
  • -k, xgettext option -
  • -l, msgfmt option, -l, msgfmt option -
  • -l, msginit 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, msgattrib option -
  • -n, msgcat option -
  • -n, msgcomm option -
  • -n, msgfilter option -
  • -N, msggrep 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, xgettext option -
  • -q, msgmerge option -
  • -r, msgfmt 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, 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, msginit option -
  • -V, msgmerge option -
  • -v, msgmerge option -
  • -v, msgunfmt option -
  • -V, msgunfmt option -
  • -V, msguniq 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, 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 +
  • --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 +
  • --compendium, msgmerge option +
  • --copy, gettextize option +
  • --copyright-holder, xgettext 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, msggrep option +
  • --exclude-file, xgettext option +
  • --expression, msgfilter option +
  • --extended-regexp, msggrep option +
  • --extract-all, xgettext option +
  • --file, msgfilter option +
  • --file, msggrep option +
  • --files-from, msgcat option +
  • --files-from, msgcomm option +
  • --files-from, xgettext option +
  • --fixed-strings, msggrep 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 +
  • --fuzzy, msgattrib 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, xgettext option +
  • --ignore-case, msggrep 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 +
  • --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, msginit option +
  • --locale, msgunfmt option, --locale, msgunfmt option +
  • --location, msggrep option +
  • --more-than, msgcat option +
  • --more-than, msgcomm option +
  • --msgid, msggrep 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-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-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 +
  • --quiet, msgfilter option +
  • --quiet, msgmerge option +
  • --regexp=, msggrep option +
  • --repeated, msguniq option +
  • --resource, msgfmt 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 +
  • --suffix, msgmerge 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, msgfmt option +
  • --verbose, msgfmt option +
  • --verbose, msgmerge option +
  • --verbose, msgunfmt 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, 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, gettextize option +
  • -c, msgfmt option +
  • -C, msgfmt option +
  • -C, msgmerge option +
  • -C, xgettext option +
  • -c, xgettext 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, msggrep option +
  • -D, msgmerge option +
  • -d, msgunfmt option +
  • -d, msguniq option +
  • -D, msguniq option +
  • -D, xgettext option +
  • -d, xgettext option +
  • -e, msgfilter option +
  • -E, msggrep option +
  • -e, msggrep 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, 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, 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, msgunfmt option +
  • -j, xgettext option +
  • -K, msggrep option +
  • -k, xgettext option +
  • -l, msgfmt option, -l, msgfmt option +
  • -l, msginit 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, msgattrib option +
  • -n, msgcat option +
  • -n, msgcomm option +
  • -n, msgfilter option +
  • -N, msggrep 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, xgettext option +
  • -q, msgmerge option +
  • -r, msgfmt 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, 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, msginit option +
  • -v, msgmerge option +
  • -V, msgmerge option +
  • -v, msgunfmt option +
  • -V, msgunfmt option +
  • -V, msguniq 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, xgettext option

    • diff --git a/doc/gettext_19.html b/doc/gettext_19.html index 8ae39e753..f1b5e54f0 100644 --- a/doc/gettext_19.html +++ b/doc/gettext_19.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Variable Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Variable Index

    +

    Variable Index

    Jump to: @@ -22,26 +22,26 @@ Jump to:

    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 +
  • 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

    • m

    -
  • MSGEXEC_LOCATION, environment variable -
  • MSGEXEC_MSGID, environment variable +
  • MSGEXEC_LOCATION, environment variable +
  • MSGEXEC_MSGID, environment variable

    • t

    -
  • TEXTDOMAIN, environment variable, TEXTDOMAIN, environment variable -
  • TEXTDOMAINDIR, environment variable, TEXTDOMAINDIR, environment variable +
  • TEXTDOMAIN, environment variable, TEXTDOMAIN, environment variable +
  • TEXTDOMAINDIR, environment variable, TEXTDOMAINDIR, environment variable

    • diff --git a/doc/gettext_2.html b/doc/gettext_2.html index c419d890d..d793b2213 100644 --- a/doc/gettext_2.html +++ b/doc/gettext_2.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 2 PO Files and PO Mode Basics @@ -174,7 +174,7 @@ 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 6.3 Fuzzy Entries. +search only. See section 6.3 Fuzzy Entries.
    c-format
    @@ -189,7 +189,7 @@ soon as the xgettext program generates a new template file. 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 8.1 Invoking the msgfmt Program. +See section 8.1 Invoking the msgfmt Program.
    @@ -303,9 +303,9 @@ When PO mode is active in a window, the letters `PO´ appear 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 6.2 Translated Entries, -3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries -(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 Obsolete Entries). Zero-coefficients items are not shown. So, in this example, if +PO mode contains 132 translated entries (see section 6.2 Translated Entries, +3 fuzzy entries (see section 6.3 Fuzzy Entries), 10 untranslated entries +(see section 6.4 Untranslated Entries) and 2 obsolete entries (see section 6.5 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. @@ -571,7 +571,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 3.3 Marking Translatable Strings. +to interactively fill an empty PO file from sources. See section 3.4 Marking Translatable Strings.

    diff --git a/doc/gettext_20.html b/doc/gettext_20.html index 35f4f9deb..37fb3c388 100644 --- a/doc/gettext_20.html +++ b/doc/gettext_20.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - PO Mode Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    PO Mode Index

    +

    PO Mode Index

    Jump to: @@ -46,28 +46,28 @@ Jump to:

    a

    -
  • auxiliary PO file +
  • auxiliary PO file

    • c

  • commands -
  • comment out PO file entry -
  • consulting program sources -
  • consulting translations to other languages +
  • 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 +
  • 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

    @@ -75,40 +75,40 @@ Jump to:

    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 +
  • 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 +
  • starting a string translation
  • string normalization in entries -
  • subedit minor mode +
  • subedit minor mode

    • t

    -
  • `TAGS´, and marking translatable strings +
  • `TAGS´, and marking translatable strings

    • 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/doc/gettext_21.html b/doc/gettext_21.html index 16f26617e..549af4875 100644 --- a/doc/gettext_21.html +++ b/doc/gettext_21.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Autoconf Macro Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    Autoconf Macro Index

    +

    Autoconf Macro Index

    Jump to: @@ -18,8 +18,8 @@ Jump to:

    a

    -
  • AM_GNU_GETTEXT -
  • AM_ICONV +
  • AM_GNU_GETTEXT +
  • AM_ICONV

    • diff --git a/doc/gettext_22.html b/doc/gettext_22.html index 50735dbef..23d31e0c1 100644 --- a/doc/gettext_22.html +++ b/doc/gettext_22.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - General Index @@ -10,7 +10,7 @@ Go to the first, previous

    -

    General Index

    +

    General Index

    Jump to: @@ -68,171 +68,176 @@ Jump to:

    _

    -
  • _, a macro to mark strings for translation -
  • _nl_msg_cat_cntr +
  • _, a macro to mark strings for translation +
  • _nl_msg_cat_cntr

    • a

    -
  • `ABOUT-NLS´ file -
  • `acconfig.h´ file -
  • accumulating translations -
  • `aclocal.m4´ file -
  • adding keywords, xgettext -
  • apply a filter to translations -
  • apply command to all translations in a catalog -
  • attribute manipulation -
  • attribute, fuzzy -
  • attributes of a PO file entry -
  • attributes, manipulating -
  • autoconf macros for gettext -
  • auxiliary PO file -
  • available translations -
  • awk +
  • `ABOUT-NLS´ file +
  • `acconfig.h´ file +
  • accumulating translations +
  • `aclocal.m4´ file +
  • adding keywords, xgettext +
  • ambiguities +
  • apply a filter to translations +
  • apply command to all translations in a catalog +
  • attribute manipulation +
  • attribute, fuzzy +
  • attributes of a PO file entry +
  • attributes, manipulating +
  • autoconf macros for gettext +
  • auxiliary PO file +
  • available translations +
  • awk

    • b

    -
  • backup old file, and msgmerge program -
  • bash -
  • bibliography +
  • backup old file, and msgmerge program +
  • bash +
  • bibliography
  • big picture -
  • bind_textdomain_codeset +
  • bind_textdomain_codeset
  • bug report address

    • c

    -
  • C and C-like languages -
  • C trigraphs -
  • 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 +
  • 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 -
  • 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 -
  • 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 +
  • 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 +
  • 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 -
  • debugging messages marked as format strings -
  • dialect -
  • disabling NLS -
  • dngettext -
  • domain ambiguities -
  • duplicate elimination -
  • duplicate removal +
  • dcngettext +
  • debugging messages marked as format strings +
  • dialect +
  • disabling NLS +
  • dngettext +
  • domain ambiguities +
  • duplicate elimination +
  • duplicate removal

    • e

    -
  • editing comments in PO files -
  • editing translations -
  • Emacs Lisp +
  • editing comments in PO files +
  • editing translations +
  • Emacs Lisp
  • encoding -
  • encoding conversion -
  • encoding conversion at runtime -
  • encoding for your language -
  • encoding list -
  • encoding of PO files +
  • encoding conversion +
  • encoding conversion at runtime +
  • encoding for your language +
  • encoding list +
  • encoding of PO files
  • evolution of packages -
  • extracting parts of a PO file into a compendium +
  • extracting parts of a PO file into a compendium

    • f

    -
  • file format, `.mo´ +
  • 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 -
  • fuzzy entries +
  • filter messages according to attributes +
  • find common messages +
  • force use of fuzzy entries +
  • format strings +
  • Free Pascal +
  • fuzzy entries

    • g

    -
  • gawk -
  • generate binary message catalog from PO file -
  • generate translation catalog in English -
  • gettext files +
  • gawk +
  • generate binary message catalog from PO file +
  • generate translation catalog in English +
  • gettext files
  • gettext installation -
  • gettext interface -
  • gettext, a programmer's view -
  • `gettext.h´ file -
  • gettext vs catgets -
  • gettextize program, usage -
  • GUI programs +
  • gettext interface +
  • gettext, a programmer's view +
  • `gettext.h´ file +
  • gettext vs catgets +
  • gettextize program, usage +
  • GUI programs

    • h

    -
  • hash table, inside MO files +
  • hash table, inside MO files
  • he, she, and they -
  • header entry of a PO file -
  • 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´ +
  • 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 +
  • initialize new PO file +
  • initialize translations from a compendium
  • installing gettext -
  • interface to catgets +
  • interface to catgets
  • internationalization -
  • ISO 3166 -
  • ISO 639 +
  • inttypes.h +
  • ISO 3166 +
  • ISO 639

    • j

    -
  • Java -
  • Java mode, and msgfmt program -
  • Java mode, and msgunfmt program +
  • Java +
  • Java mode, and msgfmt program +
  • Java mode, and msgunfmt program +
  • Java, string concatenation

    • k

    -
  • keyboard accelerator checking +
  • keyboard accelerator checking

    • l

  • l10n -
  • language codes -
  • language selection -
  • language selection at runtime -
  • large package -
  • libiconv library -
  • libintl for Java -
  • libintl library -
  • librep Lisp -
  • `LINGUAS´ file +
  • language codes +
  • language selection +
  • language selection at runtime +
  • large package +
  • libiconv library +
  • libintl for Java +
  • libintl library +
  • librep Lisp +
  • `LINGUAS´ file
  • link with `libintl´ -
  • Linux, Linux, Linux -
  • Lisp -
  • list of translation teams, where to find +
  • 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 @@ -242,159 +247,164 @@ Jump to:
  • locale facet, LC_RESPONSES
  • locale facet, LC_TIME, locale facet, LC_TIME
  • locale facets -
  • locale program +
  • locale program
  • localization

    • m

    -
  • magic signature of MO files -
  • `Makevars´ file -
  • manipulating PO files -
  • marking string initializers -
  • marking strings that require translation +
  • magic signature of MO files +
  • `Makevars´ file +
  • manipulating PO files +
  • marking string initializers +
  • marking strings that require translation +
  • marking strings, preparations
  • marking translatable strings -
  • menu entries -
  • menu, keyboard accelerator support -
  • merge PO files -
  • merging two PO files -
  • message catalog files location +
  • 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 attrributes -
  • 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 +
  • migration from earlier versions of gettext +
  • mnemonics of menu entries +
  • MO file's format +
  • modify message attrributes +
  • 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
  • NLS
  • number format

    • o

    -
  • Object Pascal -
  • obsolete entries -
  • optimization of gettext functions -
  • orthography -
  • output to stdout, xgettext +
  • Object Pascal +
  • obsolete entries +
  • optimization of gettext functions +
  • orthography +
  • output to stdout, xgettext
  • overview of gettext

    • p

    -
  • package and version declaration in `configure.in´ -
  • package build and installation options -
  • package maintainer's view of gettext -
  • Pascal -
  • Perl -
  • PHP -
  • Pike -
  • plural form formulas -
  • plural forms -
  • plural forms, in MO files +
  • package and version declaration in `configure.in´ +
  • package build and installation options +
  • package maintainer's view of gettext +
  • paragraphs +
  • Pascal +
  • Perl +
  • PHP +
  • Pike +
  • plural form formulas +
  • plural forms +
  • plural forms, in MO files
  • PO files' format
  • PO mode (Emacs) commands -
  • PO template file -
  • portability problems with sed -
  • `POTFILES.in´ file +
  • PO template file +
  • portability problems with sed +
  • `POTFILES.in´ file
  • preparing programs for translation -
  • problems with catgets interface -
  • programming languages -
  • Python +
  • problems with catgets interface +
  • programming languages +
  • Python

    • q

    -
  • quotation marks, quotation marks -
  • quote characters, use in PO files +
  • quotation marks, quotation marks +
  • quote characters, use in PO files

    • r

    -
  • related reading -
  • RST +
  • related reading +
  • RST

    • s

    -
  • scripting languages -
  • search messages in a catalog -
  • selecting message language -
  • setting up gettext at build time -
  • setting up gettext at run time -
  • several domains +
  • 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 -
  • sgettext +
  • sgettext
  • she, he, and they -
  • 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 +
  • 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 -
  • supported languages, xgettext +
  • style +
  • supported languages, xgettext

    • t

    -
  • Tcl -
  • Tcl mode, and msgfmt program -
  • Tcl mode, and msgunfmt program +
  • 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 +
  • 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 +
  • 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

    -
  • wxWindows library +
  • wxWindows 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/doc/gettext_3.html b/doc/gettext_3.html index 3b8903ab0..25b415d56 100644 --- a/doc/gettext_3.html +++ b/doc/gettext_3.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 3 Preparing Program Sources @@ -29,7 +29,7 @@ needing translation.

    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 12 The Maintainer's View), each C module +`Makefile´ files are adjusted (see section 12 The Maintainer's View), each C module having translated C strings should contain the line:

    @@ -154,9 +154,287 @@ is not multithread-safe.

    -

    3.2 How Marks Appear in Sources

    +

    3.2 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 +next sections. What you have to keep in mind while doing that is the +following. + +

    + +
      +
    • + +Decent English style. + +
    • + +Entire sentences. + +
    • + +Split at paragraphs. + +
    • + +Use format strings instead of string concatenation. +
    + +

    +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. + +

    + +
    +"%s: is parameter\n"
+
    + +

    +This is nearly untranslatable: Is the displayed item a parameter or +the parameter? + +

    + +
    +"No match"
+
    + +

    +The ambiguity in this message makes it ununderstandable: Is the program +attempting to set something on fire? Does it mean "The given object does +not match the template"? Does it mean "The template does not fit for any +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. + +

    + +
    +printf ("File %s is %s protected", filename, rw ? "write" : "read");
+
    + +

    +Most translators will not look at the source and will thus only see the +string "File %s is %s protected", which is unintelligible. Change +this to + +

    + +
    +printf (rw ? "File %s is write protected" : "File %s is read protected",
+        filename);
+
    + +

    +This way the translator will not only understand the message, she will +also be able to find the appropriate grammatical construction. The French +translator for example translates "write protected" like "protected +against writing". + +

    +

    +Often sentences don't fit into a single line. If a sentence is output +using two subsequent printf statements, like this + +

    + +
    +printf ("Locale charset \"%s\" is different from\n", lcharset);
+printf ("input file charset \"%s\".\n", fcharset);
+
    + +

    +the translator would have to translate two half sentences, but nothing +in the POT file would tell her that the two half sentences belong together. +It is necessary to merge the two printf statements so that the +translator can handle the entire sentence at once and decide at which +place to insert a line break in the translation (if at all): + +

    + +
    +printf ("Locale charset \"%s\" is different from\n\
+input file charset \"%s\".\n", lcharset, fcharset);
+
    + +

    +You may now ask: how about two or more adjacent sentences? Like in this case: + +

    + +
    +puts ("Apollo 13 scenario: Stack overflow handling failed.");
+puts ("On the next stack overflow we will crash!!!");
+
    + +

    +Should these two statements merged into a single one? I would recommend to +merge them if the two sentences are related to each other, because then it +makes it easier for the translator to understand and translate both. On +the other hand, if one of the two messages is a stereotypic one, occurring +in other places as well, you will do a favour to the translator by not +merging the two. (Identical messages occurring in several places are +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 +updating the entire translated string. Maybe only a single word will +have changed in the English string, but the translator doesn't see that +(with the current translation tools), therefore she has to proofread +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, +you can also attempt to split the documented options into groups, +such as the input options, the output options, and the informative +output options. This will help every user to find the option he is +looking for. + +

    +

    + + +Hardcoded string concatenation is sometimes used to construct English +strings: + +

    + +
    +strcpy (s, "Replace ");
+strcat (s, object1);
+strcat (s, " with ");
+strcat (s, object2);
+strcat (s, "?");
+
    + +

    +In order to present to the translator only entire sentences, and also +because in some languages the translator might want to swap the order +of object1 and object2, it is necessary to change this +to use a format string: + +

    + +
    +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´ +integer through printf. It expands to a constant string, usually +"d" or "ld" or "lld" or something like this, depending on the platform. +Assume you have code like + +

    + +
    +printf ("The amount is %0" PRId64 "\n"), number);
+
    + +

    +After marking, this cannot become + +

    + +
    +printf (gettext ("The amount is %0") PRId64 "\n"), number);
+
    + +

    +because it would simply be invalid C syntax. It cannot become + +

    + +
    +printf (gettext ("The amount is %0" PRId64 "\n")), number);
+
    + +

    +because the value of PRId64 is not known to xgettext, and +even if were, there would be three or more possibilities, and the +translator would have to translate three or more strings that differ in +a single letter. + +

    +

    +The solution for this problem is to change the code like this: + +

    + +
    +char buf1[100];
+sprintf (buf1, "%0" PRId64, number);
+printf (gettext ("The amount is %s\n"), buf1);
+
    + +

    +This means, you put the platform dependent code in one statement, and the +internationalization code in a different statement. Note that a buffer length +of 100 is safe, because all available hardware integer types are limited to +128 bits, and to print a 128 bit integer one needs at most 54 characters, +regardless whether in decimal, octal or hexadecimal. + +

    +

    + +All this applies to other programming languages as well. For example, in +Java, string contenation is very frequently used, because it is a compiler +built-in operator. Like in C, in Java, you would change + +

    + +
    +System.out.println("Replace "+object1+" with "+object2+"?");
+
    + +

    +into a statement involving a format string: + +

    + +
    +System.out.println(
+    MessageFormat.format("Replace {0} with {1}?",
+                         new Object[] { object1, object2 }));
+
    + + + +

    3.3 How Marks Appear in Sources

    +

    +

    @@ -182,7 +460,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 3.5 Special Cases of Translatable Strings. +strings appear in structured initializations. See section 3.6 Special Cases of Translatable Strings.

    @@ -207,7 +485,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, @@ -241,9 +519,9 @@ an example of string not requiring translation!

    -

    3.3 Marking Translatable Strings

    +

    3.4 Marking Translatable Strings

    - +

    @@ -260,7 +538,7 @@ translation in some language, for the package being internationalized.

    - + The set of program sources, targetted 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 @@ -282,7 +560,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. @@ -302,18 +580,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). @@ -321,7 +599,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, @@ -373,8 +651,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 @@ -432,10 +710,10 @@ prefer `_´, as this one is already built in the M-, -

    3.4 Special Comments preceding Keywords

    +

    3.5 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 @@ -503,8 +781,8 @@ only a heuristic. In the `.po´ file the entry is marked using th

    - - + + 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 special kind of comment which lets @@ -541,16 +819,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 4.1 Invoking the xgettext Program to see how the --debug option can be +section 4.1 Invoking the xgettext Program to see how the --debug option can be used for solving this problem.

    -

    3.5 Special Cases of Translatable Strings

    +

    3.6 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: @@ -577,7 +855,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 4.1 Invoking the xgettext Program) +strings so that the xgettext program (see section 4.1 Invoking the xgettext Program) can find them, and second we have to translate the string at runtime before printing them. @@ -610,7 +888,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 4.1 Invoking the xgettext Program. +the additional keyword gettext_noop is explained in section 4.1 Invoking the xgettext Program.

    diff --git a/doc/gettext_4.html b/doc/gettext_4.html index 2b7f28964..925de8ec9 100644 --- a/doc/gettext_4.html +++ b/doc/gettext_4.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 4 Making the PO Template File @@ -10,9 +10,9 @@ Go to the first, previous<

    -

    4 Making the PO Template File

    +

    4 Making the PO Template File

    - +

    @@ -23,11 +23,11 @@ This section explains how to use xgettext for this purpose. -

    4.1 Invoking the xgettext Program

    +

    4.1 Invoking the xgettext Program

    - - + + 

     xgettext [option] [inputfile] ...
@@ -40,7 +40,7 @@ input files.
 
    
 
 
-
    4.1.1  Input file location
    
+
    4.1.1  Input file location
    
 
 
    
 
@@ -52,8 +52,8 @@ Input files.
 
    
 
    `--files-from=file´
 
    
-
-
+
+
 Read the names of the input files from file instead of getting
 them from the command line.
 
@@ -61,8 +61,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.
@@ -75,7 +75,7 @@ If inputfile is `-´, standard input is read.
 
    
 
 
-
    4.1.2  Output file location
    
+
    4.1.2  Output file location
    
 
 
    
 
@@ -83,16 +83,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´).
 
@@ -100,21 +100,21 @@ Write output to specified file (instead of `name.po´ o
 
    
 
    `--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.
 
 
    
 
 
-
    4.1.3  Choice of input file language
    
+
    4.1.3  Choice of input file language
    
 
 
    
 
@@ -122,9 +122,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, Java, awk,
@@ -134,8 +134,8 @@ are C, C++, ObjectiveC, PO,
 
    
 
    `--c++´
 
    
-
-
+
+
 This is a shorthand for --language=C++.
 
 
    
@@ -147,7 +147,7 @@ extension.
 
    
 
 
-
    4.1.4  Operation mode
    
+
    4.1.4  Operation mode
    
 
 
    
 
@@ -155,16 +155,16 @@ extension.
 
    
 
    `--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.
 
@@ -172,8 +172,8 @@ POT file.
 
    
 
    `--add-comments[=tag]´
 
    
-
-
+
+
 Place comment block with tag (or those preceding keyword lines)
 in output file.
 
@@ -181,7 +181,7 @@ in output file.
 
 
 
-
    4.1.5  Language=C/C++ specific options
    
+
    4.1.5  Language=C/C++ specific options
    
 
 
    
 
@@ -189,20 +189,20 @@ in output file.
 
    
 
    `--extract-all´
 
    
-
-
+
+
 Extract all strings.
 
 
    `-k keywordspec´
 
    
 
    `--keyword[=keywordspec]´
 
    
-
-
+
+
 Additional keyword to be looked for (without keywordspec means not to
 use default keywords).
 
-
+
 If keywordspec is a C identifer id, xgettext looks
 for strings in the first argument of each call to the function or macro
 id.  If keywordspec is of the form
@@ -222,15 +222,15 @@ explicitly disabled, are gettext, dgettext:2,
 
    
 
    `--trigraphs´
 
    
-
-
-
+
+
+
 Understand ANSI C trigraphs for input.
 
 
    `--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
@@ -249,39 +249,39 @@ adjacent strings, and escaped end of lines for continued strings.
 
    
 
 
-
    4.1.6  Output details
    
+
    4.1.6  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.
 
 
    `-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.
@@ -290,19 +290,26 @@ GNU extensions.
 
    
 
    `--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.
+
 
    `-s´
 
    
 
    `--sort-output´
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -310,16 +317,16 @@ 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
@@ -327,7 +334,7 @@ options at different times are guaranteed to produce the same results.
 
 
    `--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
@@ -343,7 +350,7 @@ 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.
@@ -352,23 +359,23 @@ project that want their translations to be in the public domain.
 
    
 
    `--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.
 
 
    
 
 
 
-
    4.1.7  Informative output
    
+
    4.1.7  Informative output
    
 
 
    
 
@@ -376,16 +383,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/doc/gettext_5.html b/doc/gettext_5.html
index 975785024..f614030be 100644
--- a/doc/gettext_5.html
+++ b/doc/gettext_5.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 24 April 2002 -->
 
 GNU gettext utilities - 5  Creating a New PO File
 
@@ -10,9 +10,9 @@ Go to the first, previous<
 
    
 
 
-
    5  Creating a New PO File
    
+
    5  Creating a New PO File
    
 
    
-
+
 
 
    
 
    
@@ -44,26 +44,26 @@ the header entry of this file.
 
 
 
-
    5.1  Invoking the msginit Program
    
+
    5.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.
 
 
    
 
 
-
    5.1.1  Input file location
    
+
    5.1.1  Input file location
    
 
 
    
 
@@ -71,8 +71,8 @@ information with values from the user's environment.
 
    
 
    `--input=inputfile´
 
    
-
-
+
+
 Input POT file.
 
 
    
@@ -84,7 +84,7 @@ POT file.  If it is `-´, standard input is read.
 
    
 
 
-
    5.1.2  Output file location
    
+
    5.1.2  Output file location
    
 
 
    
 
@@ -92,8 +92,8 @@ POT file.  If it is `-´, standard input is read.
 
    
 
    `--output-file=file´
 
    
-
-
+
+
 Write output to specified PO file.
 
 
    
@@ -106,7 +106,7 @@ standard output.
 
    
 
 
-
    5.1.3  Output details
    
+
    5.1.3  Output details
    
 
 
    
 
@@ -114,15 +114,15 @@ standard output.
 
    
 
    `--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.
 
@@ -130,17 +130,24 @@ automatically generated.
 
    
 
    `--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.
+
 
    
 
 
 
-
    5.1.4  Informative output
    
+
    5.1.4  Informative output
    
 
 
    
 
@@ -148,25 +155,25 @@ split across multiple lines in order to ensure that each line's width
 
    
 
    `--help´
 
    
-
-
+
+
 Display this help and exit.
 
 
    `-V´
 
    
 
    `--version´
 
    
-
-
+
+
 Output version information and exit.
 
 
    
 
 
 
-
    5.2  Filling in the Header Entry
    
+
    5.2  Filling in the Header Entry
    
 
    
-
+
 
 
    
 
    
@@ -211,7 +218,7 @@ 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/,
@@ -219,14 +226,14 @@ in the "National 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 10.2.4  How to specify the output character set gettext uses).
+locale's character encoding differs from yours (see section 10.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
@@ -234,7 +241,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
@@ -249,11 +256,11 @@ are limited to those supported by both GNU libc and GNU
 BIG5, BIG5-HKSCS, GBK, GB18030, SHIFT_JIS,
 JOHAB, TIS-620, VISCII, UTF-8.
 
-
+
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-
+
 
 
      
 
    • ISO-8859-1 for
@@ -304,8 +311,8 @@ corresponding languages.
 
 
    
 
-
-
+
+
 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
@@ -317,7 +324,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",
@@ -339,7 +346,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 10.2.5  Additional functions for plural forms.
+format of the plural forms field is described in section 10.2.5  Additional functions for plural forms.
 
    
 
 
    
diff --git a/doc/gettext_6.html b/doc/gettext_6.html
index 23fad1983..2c1a7b003 100644
--- a/doc/gettext_6.html
+++ b/doc/gettext_6.html
@@ -1,7 +1,7 @@
 
 
 
+     from gettext.texi on 24 April 2002 -->
 
 GNU gettext utilities - 6  Updating Existing PO Files
 
@@ -10,15 +10,15 @@ Go to the first, previous<
 
    
 
 
-
    6  Updating Existing PO Files
    
+
    6  Updating Existing PO Files
    
 
 
 
-
    6.1  Invoking the msgmerge Program
    
+
    6.1  Invoking the msgmerge Program
    
 
 
    
-
-
+
+
 
 
     msgmerge [option] def.po ref.pot
@@ -39,7 +39,7 @@ is used to produce better results.
 
    
 
 
-
    6.1.1  Input file location
    
+
    6.1.1  Input file location
    
 
 
    
 
@@ -55,8 +55,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.
@@ -65,16 +65,16 @@ file will be written relative to the current directory, though.
 
    
 
    `--compendium=file´
 
    
-
-
-Specify an additional library of message translations.  See section 6.11  Using Translation Compendia.
+
+
+Specify an additional library of message translations.  See section 6.11  Using Translation Compendia.
 This option may be specified more than once.
 
 
    
 
 
 
-
    6.1.2  Operation mode
    
+
    6.1.2  Operation mode
    
 
 
    
 
@@ -82,15 +82,15 @@ This option may be specified more than once.
 
    
 
    `--update´
 
    
-
-
+
+
 Update def.po.  Do nothing if def.po is already up to date.
 
 
    
 
 
 
-
    6.1.3  Output file location
    
+
    6.1.3  Output file location
    
 
 
    
 
@@ -98,21 +98,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 `-´.
 
 
    
 
 
-
    6.1.4  Output file location in update mode
    
+
    6.1.4  Output file location in update mode
    
 
 
    
 The result is written back to def.po.
@@ -122,19 +122,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:
@@ -176,7 +176,7 @@ The backup suffix is `~´, unless set with --suffix
 
 
-
    6.1.5  Operation modifiers
    
+
    6.1.5  Operation modifiers
    
 
 
    
 
@@ -184,44 +184,44 @@ The backup suffix is `~´, unless set with --suffix
 
    `--multi-domain´
 
    
-
-
+
+
 Apply ref.pot to each of the domains in def.po.
 
 
    
 
 
 
-
    6.1.6  Output details
    
+
    6.1.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.
 
 
    `--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.
@@ -230,19 +230,26 @@ GNU extensions.
 
    
 
    `--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.
+
 
    `-s´
 
    
 
    `--sort-output´
 
    
-
-
-
+
+
+
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -250,15 +257,15 @@ for the translator to understand each message's context.
 
    
 
    `--sort-by-file´
 
    
-
-
+
+
 Sort output by file location.
 
 
    
 
 
 
-
    6.1.7  Informative output
    
+
    6.1.7  Informative output
    
 
 
    
 
@@ -266,24 +273,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´
@@ -292,30 +299,30 @@ Increase verbosity level.
 
    
 
    `--silent´
 
    
-
-
-
+
+
+
 Suppress progress indicators.
 
 
    
 
 
 
-
    6.2  Translated Entries
    
+
    6.2  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 6.3  Fuzzy Entries),
+a translation, and which is not marked as fuzzy (see section 6.3  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.
 
 
    
@@ -323,21 +330,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
@@ -345,25 +352,25 @@ wraps around in the PO file buffer.
 
 
    
 
    
-
+
 Translated entries usually result from the translator having edited in
-a translation for them, section 6.6  Modifying Translations.  However, if the
+a translation for them, section 6.6  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 6.3  Fuzzy Entries.
+See section 6.3  Fuzzy Entries.
 
 
    
 
 
-
    6.3  Fuzzy Entries
    
+
    6.3  Fuzzy Entries
    
 
    
-
+
 
 
    
 
    
-
-
+
+
 Each PO file entry may have a set of attributes, which are
 qualities given a name and explicitely associated with the translation,
 using a special system comment.  One of these attributes
@@ -386,7 +393,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
@@ -397,26 +404,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 @@ -424,9 +431,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 @@ -448,8 +455,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 @@ -464,9 +471,9 @@ still exists.

    -

    6.4 Untranslated Entries

    +

    6.4 Untranslated Entries

    - +

    @@ -486,7 +493,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. @@ -498,26 +505,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 @@ -525,11 +532,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 6.6 Modifying Translations. +(po-kill-msgstr). See section 6.6 Modifying Translations.

    @@ -540,9 +547,9 @@ if some untranslated string still exists.

    -

    6.5 Obsolete Entries

    +

    6.5 Obsolete Entries

    - +

    @@ -568,7 +575,7 @@ after the fact.

    - + Moreover, some commands are more specifically related to obsolete entry processing. @@ -577,27 +584,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 @@ -613,10 +620,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. @@ -626,7 +633,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 6.6 Modifying Translations. +entry, usually one which is untranslated. See section 6.6 Modifying Translations.

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

    -

    6.6 Modifying Translations

    +

    6.6 Modifying Translations

    - - + +

    @@ -673,40 +680,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 @@ -714,14 +721,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 6.8 Details of Sub Edition, +results, or C-c C-k to abort her modifications. See section 6.8 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 @@ -729,7 +736,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 @@ -738,7 +745,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 @@ -752,11 +759,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 @@ -788,8 +795,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 @@ -823,7 +830,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 @@ -861,10 +868,10 @@ See section `Keyboard Macros' in The Emacs Editor.

    -

    6.7 Modifying Comments

    +

    6.7 Modifying Comments

    - - + +

    @@ -886,31 +893,31 @@ they are not meant for the translator to modify. See section 6.6 Modifying Translations. +so the general indications given for those apply here. See section 6.6 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). @@ -922,12 +929,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 6.6 Modifying Translations. +See section 6.6 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 @@ -937,22 +944,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 6.8 Details of Sub Edition, for further details. +See section 6.8 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 @@ -991,9 +998,9 @@ regular Emacs commands C-y (yank) and M-y

    -

    6.8 Details of Sub Edition

    +

    6.8 Details of Sub Edition

    - +

    @@ -1006,25 +1013,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 @@ -1034,8 +1041,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 @@ -1046,14 +1053,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 6.10 Consulting Auxiliary PO Files). +auxiliary PO files are already available to her (see section 6.10 Consulting Auxiliary PO Files).

    @@ -1081,7 +1088,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 @@ -1094,7 +1101,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 @@ -1103,11 +1110,11 @@ are automatically resumed one at a time, so she may decide for each of them.

    -

    6.9 C Sources Context

    +

    6.9 C Sources Context

    - - - + + +

    @@ -1144,7 +1151,7 @@ overall organization, than to programmation itself.

    - + The following commands are meant to help the translator at getting program source context for a PO file entry. @@ -1153,35 +1160,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 @@ -1226,10 +1233,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. @@ -1247,9 +1254,9 @@ one of the directories she does not want anymore on the search path.

    -

    6.10 Consulting Auxiliary PO Files

    +

    6.10 Consulting Auxiliary PO Files

    - +

    @@ -1262,8 +1269,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 @@ -1278,41 +1285,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. @@ -1324,8 +1331,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 @@ -1345,7 +1352,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 the `M-x normalize´ command. Until these @@ -1355,13 +1362,13 @@ fully resolved, the translator should stay aware of normalisation issues.

    -

    6.11 Using Translation Compendia

    +

    6.11 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 @@ -1372,10 +1379,10 @@ already translated entries, from translations kept in the compendium. -

    6.11.1 Creating Compendia

    +

    6.11.1 Creating Compendia

    - - + +

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

    -

    6.11.1.1 Concatenate PO Files

    +

    6.11.1.1 Concatenate PO Files

    - - + + To concatenate several valid PO files into one compendium file you can use `msgcomm´ or `msgcat´ (the latter preferred): @@ -1470,9 +1477,9 @@ files or postprocess the result using `msgattrib --translated --no-fuzzy&a

    -

    6.11.1.2 Extract a Message Subset from a PO File

    +

    6.11.1.2 Extract a Message Subset from a PO File

    - +

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

    6.11.2 Using Compendia

    +

    6.11.2 Using Compendia

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

    -

    6.11.2.1 Initialize a New Translation File

    +

    6.11.2.1 Initialize a New Translation File

    - +

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

    6.11.2.2 Update an Existing Translation File

    +

    6.11.2.2 Update an Existing Translation File

    - +

    diff --git a/doc/gettext_7.html b/doc/gettext_7.html index 0de9a8902..20cae6e8a 100644 --- a/doc/gettext_7.html +++ b/doc/gettext_7.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 7 Manipulating PO Files @@ -10,9 +10,9 @@ Go to the first, previous<

    -

    7 Manipulating PO Files

    +

    7 Manipulating PO Files

    - +

    @@ -22,7 +22,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 @@ -32,7 +32,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 @@ -48,8 +48,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 @@ -66,14 +66,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. @@ -91,7 +91,7 @@ completely translated.

    - + `msgattrib´ can be used to select and extract only the fuzzy or untranslated messages of a translation catalog. @@ -104,19 +104,19 @@ catalogs. It copies each message's msgid to its msgstr. -

    7.1 Invoking the msgcat Program

    +

    7.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 @@ -130,7 +130,7 @@ to define them. File positions from all PO files will be cumulated.

    -

    7.1.1 Input file location

    +

    7.1.1 Input file location

    @@ -142,8 +142,8 @@ Input files.
    `--files-from=file´
    - - + + Read the names of the input files from file instead of getting them from the command line. @@ -151,8 +151,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. @@ -165,7 +165,7 @@ If inputfile is `-´, standard input is read.

    -

    7.1.2 Output file location

    +

    7.1.2 Output file location

    @@ -173,21 +173,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 `-´.

    -

    7.1.3 Message selection

    +

    7.1.3 Message selection

    @@ -195,8 +195,8 @@ or if it is `-´.
    `--less-than=number´
    - - + + Print messages with less than number definitions, defaults to infinite if not set. @@ -204,8 +204,8 @@ if not set.
    `--more-than=number´
    - - + + Print messages with more than number definitions, defaults to 0 if not set. @@ -213,8 +213,8 @@ set.
    `--unique´
    - - + + Shorthand for `--less-than=2´. Requests that only unique messages be printed. @@ -222,7 +222,7 @@ printed. -

    7.1.4 Output details

    +

    7.1.4 Output details

    @@ -230,45 +230,45 @@ printed.
    `--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. @@ -277,19 +277,26 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -297,15 +304,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.1.5 Informative output

    +

    7.1.5 Informative output

    @@ -313,41 +320,41 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.2 Invoking the msgconv Program

    +

    7.2 Invoking the msgconv Program

    - - + + 

     msgconv [option] [inputfile]

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

    -

    7.2.1 Input file location

    +

    7.2.1 Input file location

    @@ -359,8 +366,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. @@ -373,7 +380,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.2.2 Output file location

    +

    7.2.2 Output file location

    @@ -381,8 +388,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -394,7 +401,7 @@ or if it is `-´.

    -

    7.2.3 Conversion target

    +

    7.2.3 Conversion target

    @@ -402,8 +409,8 @@ or if it is `-´.
    `--to-code=name´
    - - + + Specify encoding for output.
    @@ -414,36 +421,36 @@ The default encoding is the current locale's encoding.

    -

    7.2.4 Output details

    +

    7.2.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. @@ -452,18 +459,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -471,15 +485,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.2.5 Informative output

    +

    7.2.5 Informative output

    @@ -487,41 +501,41 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.3 Invoking the msggrep Program

    +

    7.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.

    -

    7.3.1 Input file location

    +

    7.3.1 Input file location

    @@ -533,8 +547,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. @@ -547,7 +561,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.3.2 Output file location

    +

    7.3.2 Output file location

    @@ -555,8 +569,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -568,7 +582,7 @@ or if it is `-´.

    -

    7.3.3 Message selection

    +

    7.3.3 Message selection

    @@ -618,8 +632,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.
 
@@ -627,97 +641,97 @@ either a literal file name or a wildcard pattern.
 
    
 
    `--domain=domainname´
 
    
-
-
+
+
 Select messages belonging to domain domainname.
 
 
    `-K´
 
    
 
    `--msgid´
 
    
-
-
+
+
 Start of patterns for the msgid.
 
 
    `-T´
 
    
 
    `--msgstr´
 
    
-
-
+
+
 Start of patterns for the msgstr.
 
 
    `-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.
    -

    7.3.4 Output details

    +

    7.3.4 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. @@ -726,28 +740,35 @@ GNU extensions.
    `--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.
    -

    7.3.5 Informative output

    +

    7.3.5 Informative output

    @@ -755,41 +776,41 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.4 Invoking the msgfilter Program

    +

    7.4 Invoking the msgfilter Program

    - - + + 

     msgfilter [option] filter [filter-option]

    - + The msgfilter program applies a filter to all translations of a translation catalog.

    -

    7.4.1 Input file location

    +

    7.4.1 Input file location

    @@ -797,16 +818,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. @@ -819,7 +840,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.4.2 Output file location

    +

    7.4.2 Output file location

    @@ -827,8 +848,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -840,7 +861,7 @@ or if it is `-´.

    -

    7.4.3 The filter

    +

    7.4.3 The filter

    The filter can be any program that reads a translation from standard @@ -849,7 +870,7 @@ used filter is `sed´.

    - + Note: It is your responsibility to ensure that the filter can cope with input encoded in the translation catalog's encoding. If the filter wants input in a particular encoding, you can in a first step @@ -862,7 +883,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 @@ -874,7 +895,7 @@ does not have this limitation.

    -

    7.4.4 Useful filter-options when the filter is `sed´

    +

    7.4.4 Useful filter-options when the filter is `sed´

    @@ -882,16 +903,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´ @@ -900,49 +921,49 @@ Add the contents of scriptfile to the commands to be executed.
    `--silent´
    - - - + + + Suppress automatic printing of pattern space.
    -

    7.4.5 Output details

    +

    7.4.5 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. @@ -951,18 +972,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -970,15 +998,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.4.6 Informative output

    +

    7.4.6 Informative output

    @@ -986,35 +1014,35 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.5 Invoking the msguniq Program

    +

    7.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, @@ -1029,7 +1057,7 @@ discarded.

    -

    7.5.1 Input file location

    +

    7.5.1 Input file location

    @@ -1041,8 +1069,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. @@ -1055,7 +1083,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.5.2 Output file location

    +

    7.5.2 Output file location

    @@ -1063,8 +1091,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -1076,7 +1104,7 @@ or if it is `-´.

    -

    7.5.3 Message selection

    +

    7.5.3 Message selection

    @@ -1084,23 +1112,23 @@ or if it is `-´.
    `--repeated´
    - - + + Print only duplicates.
    `-u´
    `--unique´
    - - + + Print only unique messages, discard duplicates.
    -

    7.5.4 Output details

    +

    7.5.4 Output details

    @@ -1108,45 +1136,45 @@ Print only unique messages, discard duplicates.
    `--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. @@ -1155,18 +1183,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1174,15 +1209,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.5.5 Informative output

    +

    7.5.5 Informative output

    @@ -1190,34 +1225,34 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.6 Invoking the msgcomm Program

    +

    7.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 @@ -1231,7 +1266,7 @@ cumulated.

    -

    7.6.1 Input file location

    +

    7.6.1 Input file location

    @@ -1243,8 +1278,8 @@ Input files.
    `--files-from=file´
    - - + + Read the names of the input files from file instead of getting them from the command line. @@ -1252,8 +1287,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. @@ -1266,7 +1301,7 @@ If inputfile is `-´, standard input is read.

    -

    7.6.2 Output file location

    +

    7.6.2 Output file location

    @@ -1274,8 +1309,8 @@ If inputfile is `-´, standard input is read.
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -1287,7 +1322,7 @@ or if it is `-´.

    -

    7.6.3 Message selection

    +

    7.6.3 Message selection

    @@ -1295,8 +1330,8 @@ or if it is `-´.
    `--less-than=number´
    - - + + Print messages with less than number definitions, defaults to infinite if not set. @@ -1304,8 +1339,8 @@ if not set.
    `--more-than=number´
    - - + + Print messages with more than number definitions, defaults to 1 if not set. @@ -1313,8 +1348,8 @@ set.
    `--unique´
    - - + + Shorthand for `--less-than=2´. Requests that only unique messages be printed. @@ -1322,39 +1357,39 @@ printed. -

    7.6.4 Output details

    +

    7.6.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.
    `-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. @@ -1363,18 +1398,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1382,20 +1424,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.
    -

    7.6.5 Informative output

    +

    7.6.5 Informative output

    @@ -1403,34 +1445,34 @@ Don't write header with `msgid ""´ entry.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.7 Invoking the msgcmp Program

    +

    7.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 @@ -1442,7 +1484,7 @@ used to produce better diagnostics.

    -

    7.7.1 Input file location

    +

    7.7.1 Input file location

    @@ -1458,8 +1500,8 @@ References to the sources.
    `--directory=directory´
    - - + + Add directory to the list of directories. Source files are searched relative to this list of directories. @@ -1467,7 +1509,7 @@ searched relative to this list of directories. -

    7.7.2 Operation modifiers

    +

    7.7.2 Operation modifiers

    @@ -1475,15 +1517,15 @@ searched relative to this list of directories.
    `--multi-domain´
    - - + + Apply ref.pot to each of the domains in def.po.
    -

    7.7.3 Informative output

    +

    7.7.3 Informative output

    @@ -1491,42 +1533,42 @@ Apply ref.pot to each of the domains in def.po.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.8 Invoking the msgattrib Program

    +

    7.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.

    -

    7.8.1 Input file location

    +

    7.8.1 Input file location

    @@ -1538,8 +1580,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. @@ -1552,7 +1594,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.8.2 Output file location

    +

    7.8.2 Output file location

    @@ -1560,8 +1602,8 @@ If no inputfile is given or if it is `-´, standard
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -1573,48 +1615,48 @@ or if it is `-´.

    -

    7.8.3 Message selection

    +

    7.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 messsages.
    `--no-obsolete´
    - + Remove obsolete #~ messages.
    `--only-obsolete´
    - + Keep obsolete #~ messages, remove all other messages.
    -

    7.8.4 Attribute manipulation

    +

    7.8.4 Attribute manipulation

    - + Attributes are modified after the message selection/removal has been performed. @@ -1623,33 +1665,33 @@ performed.

    `--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.
    `--fuzzy´
    - + Synonym for `--only-fuzzy --clear-fuzzy´: It keeps only the fuzzy messages and removes their `fuzzy' mark.
    `--obsolete´
    - + Synonym for `--only-obsolete --clear-obsolete´: It keeps only the obsolete messages and makes them non-obsolete. @@ -1657,39 +1699,39 @@ obsolete messages and makes them non-obsolete. -

    7.8.5 Output details

    +

    7.8.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. @@ -1698,18 +1740,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1717,15 +1766,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.8.6 Informative output

    +

    7.8.6 Informative output

    @@ -1733,34 +1782,34 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.9 Invoking the msgen Program

    +

    7.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 @@ -1775,7 +1824,7 @@ the header entry, whereas msgen doesn't.

    -

    7.9.1 Input file location

    +

    7.9.1 Input file location

    @@ -1787,8 +1836,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. @@ -1801,7 +1850,7 @@ If inputfile is `-´, standard input is read.

    -

    7.9.2 Output file location

    +

    7.9.2 Output file location

    @@ -1809,8 +1858,8 @@ If inputfile is `-´, standard input is read.
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -1822,36 +1871,36 @@ or if it is `-´.

    -

    7.9.3 Output details

    +

    7.9.3 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. @@ -1860,18 +1909,25 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -1879,15 +1935,15 @@ for the translator to understand each message's context.
    `--sort-by-file´
    - - + + Sort output by file location.
    -

    7.9.4 Informative output

    +

    7.9.4 Informative output

    @@ -1895,34 +1951,34 @@ Sort output by file location.
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    -

    7.10 Invoking the msgexec Program

    +

    7.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 @@ -1932,15 +1988,15 @@ 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 @@ -1948,7 +2004,7 @@ of the message.

    - + 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 @@ -1962,7 +2018,7 @@ locale, by using the LC_ALL environment variable.

    -

    7.10.1 Input file location

    +

    7.10.1 Input file location

    @@ -1970,16 +2026,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. @@ -1992,7 +2048,7 @@ If no inputfile is given or if it is `-´, standard

    -

    7.10.2 Informative output

    +

    7.10.2 Informative output

    @@ -2000,16 +2056,16 @@ If no inputfile is given or if it is `-´, standard
    `--help´
    - - + + Display this help and exit.
    `-V´
    `--version´
    - - + + Output version information and exit.
    diff --git a/doc/gettext_8.html b/doc/gettext_8.html index 5bc1047be..5e369c4ac 100644 --- a/doc/gettext_8.html +++ b/doc/gettext_8.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 8 Producing Binary MO Files @@ -10,29 +10,29 @@ Go to the first, previous<

    -

    8 Producing Binary MO Files

    +

    8 Producing Binary MO Files

    -

    8.1 Invoking the msgfmt Program

    +

    8.1 Invoking the msgfmt Program

    - - + + 

     msgfmt [option] filename.po ...

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

    -

    8.1.1 Input file location

    +

    8.1.1 Input file location

    @@ -42,8 +42,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. @@ -56,7 +56,7 @@ If an input file is `-´, standard input is read.

    -

    8.1.2 Operation mode

    +

    8.1.2 Operation mode

    @@ -64,27 +64,27 @@ 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).
    `--tcl´
    - - + + Tcl mode: generate a tcl/msgcat `.msg´ file.
    -

    8.1.3 Output file location

    +

    8.1.3 Output file location

    @@ -92,13 +92,13 @@ Tcl mode: generate a tcl/msgcat `.msg´ 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 @@ -117,7 +117,7 @@ If the output file is `-´, output is written to st

    -

    8.1.4 Output file location in Java mode

    +

    8.1.4 Output file location in Java mode

    @@ -125,22 +125,22 @@ If the output file is `-´, output is written to st
    `--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.
    @@ -153,7 +153,7 @@ is written under the specified directory.

    -

    8.1.5 Output file location in Tcl mode

    +

    8.1.5 Output file location in Tcl mode

    @@ -161,14 +161,14 @@ is written under the specified directory.
    `--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.
    @@ -180,7 +180,7 @@ written in the specified directory.

    -

    8.1.6 Input file interpretation

    +

    8.1.6 Input file interpretation

    @@ -188,15 +188,15 @@ written in the specified directory.
    `--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 @@ -215,19 +215,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 3.4 Special Comments preceding Keywords). The translator should not +xgettext program (see section 3.5 Special Comments preceding Keywords). 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 5.2 Filling in the Header Entry, + +Verify presence and contents of the header entry. See section 5.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 @@ -235,18 +235,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. @@ -261,9 +261,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. @@ -272,7 +272,7 @@ a human translator. -

    8.1.7 Output details

    +

    8.1.7 Output details

    @@ -280,13 +280,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). @@ -294,7 +294,7 @@ at run time (binary search instead of hash table lookup). -

    8.1.8 Informative output

    +

    8.1.8 Informative output

    @@ -302,54 +302,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.
    -

    8.2 Invoking the msgunfmt Program

    +

    8.2 Invoking the msgunfmt Program

    - - + + 

     msgunfmt [option] [file]...

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

    -

    8.2.1 Operation mode

    +

    8.2.1 Operation mode

    @@ -357,22 +357,22 @@ Uniforum style .po file.
    `--java´
    - - - + + + Java mode: input is a Java ResourceBundle class.
    `--tcl´
    - - + + Tcl mode: input is a tcl/msgcat `.msg´ file.
    -

    8.2.2 Input file location

    +

    8.2.2 Input file location

    @@ -388,7 +388,7 @@ If no input file is given or if it is `-´, standar

    -

    8.2.3 Input file location in Java mode

    +

    8.2.3 Input file location in Java mode

    @@ -396,16 +396,16 @@ If no input file is given or if it is `-´, standar
    `--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. @@ -418,7 +418,7 @@ separated with an underscore. The class is located using the CLASSPATH -

    8.2.4 Input file location in Tcl mode

    +

    8.2.4 Input file location in Tcl mode

    @@ -426,14 +426,14 @@ separated with an underscore. The class is located using the CLASSPATH
    `--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.
    @@ -445,7 +445,7 @@ located in the specified directory.

    -

    8.2.5 Output file location

    +

    8.2.5 Output file location

    @@ -453,8 +453,8 @@ located in the specified directory.
    `--output-file=file´
    - - + + Write output to specified file.
    @@ -466,26 +466,26 @@ or if it is `-´.

    -

    8.2.6 Output details

    +

    8.2.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.
    `--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. @@ -494,19 +494,26 @@ GNU extensions.
    `--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. +
    `-s´
    `--sort-output´
    - - - + + + Generate sorted output. Note that using this option makes it much harder for the translator to understand each message's context. @@ -514,7 +521,7 @@ for the translator to understand each message's context. -

    8.2.7 Informative output

    +

    8.2.7 Informative output

    @@ -522,34 +529,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.
    -

    8.3 The Format of GNU MO Files

    +

    8.3 The Format of GNU MO Files

    - - + +

    @@ -558,7 +565,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 @@ -606,7 +613,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 @@ -627,7 +634,7 @@ machines, a correct alignment will speed things up.

    - + 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/doc/gettext_9.html b/doc/gettext_9.html index fc782157a..4f084b96c 100644 --- a/doc/gettext_9.html +++ b/doc/gettext_9.html @@ -1,7 +1,7 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - 9 The User's View @@ -10,7 +10,7 @@ Go to the first, previous<

    -

    9 The User's View

    +

    9 The User's View

    When GNU gettext will truly have reached its goal, average users @@ -43,11 +43,11 @@ for both installers and end users. -

    9.1 The Current `ABOUT-NLS´ Matrix

    +

    9.1 The Current `ABOUT-NLS´ Matrix

    - - - + + +

    @@ -57,7 +57,7 @@ may check the distribution for the `ABOUT-NLS´ information file, 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 9.3 Magic for End Users for a complete description of the format +the language. section 9.3 Magic for End Users for a complete description of the format for ll.

    @@ -75,10 +75,10 @@ Translation Project sites, and also on most GNU archive sites.

    -

    9.2 Magic for Installers

    +

    9.2 Magic for Installers

    - - + +

    @@ -97,7 +97,7 @@ produces programs totally unable to translate messages.

    - + Internationalized packages have usually many `ll.po´ files. Unless translations are disabled, all those available are installed together @@ -109,20 +109,20 @@ codes, stating which languages are allowed.

    -

    9.3 Magic for End Users

    +

    9.3 Magic for End Users

    - - - + + +

    - + 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 9.1 The Current `ABOUT-NLS´ Matrix. +combination prior to using the programs in the package. See section 9.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 diff --git a/doc/gettext_foot.html b/doc/gettext_foot.html index 9e75451f4..87ad64aa7 100644 --- a/doc/gettext_foot.html +++ b/doc/gettext_foot.html @@ -1,14 +1,14 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Footnotes -

    GNU gettext tools, version 0.11.1

    +

    GNU gettext tools, version 0.11.2

    Native Language Support Library and Tools

    -

    Edition 0.11.1, 5 March 2002

    +

    Edition 0.11.2, 22 April 2002

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -36,7 +36,7 @@ variables.

    Additions are welcome. Send appropriate information to bug-glibc-manual@gnu.org.

    -This document was generated on 7 March 2002 using the +This document was generated on 24 April 2002 using the texi2html translator version 1.52a.

    diff --git a/doc/gettext_toc.html b/doc/gettext_toc.html index c272ae277..803c04e2a 100644 --- a/doc/gettext_toc.html +++ b/doc/gettext_toc.html @@ -1,14 +1,14 @@ + from gettext.texi on 24 April 2002 --> GNU gettext utilities - Table of Contents -

    GNU gettext tools, version 0.11.1

    +

    GNU gettext tools, version 0.11.2

    Native Language Support Library and Tools

    -

    Edition 0.11.1, 5 March 2002

    +

    Edition 0.11.2, 22 April 2002

    Ulrich Drepper
    Jim Meyering
    François Pinard
    @@ -35,299 +35,300 @@
  • 3 Preparing Program Sources -
  • 4 Making the PO Template File +
  • 4 Making the PO Template File -
  • 5 Creating a New PO File +
  • 5 Creating a New PO File -
  • 6 Updating Existing PO Files +
  • 6 Updating Existing PO Files -
  • 7 Manipulating PO Files +
  • 7 Manipulating PO Files -
  • 8 Producing Binary MO Files +
  • 8 Producing Binary MO Files -
  • 9 The User's View +
  • 9 The User's View -
  • 10 The Programmer's View +
  • 10 The Programmer's View -
  • 11 The Translator's View +
  • 11 The Translator's View -
  • 12 The Maintainer's View +
  • 12 The Maintainer's View -
  • 13 Other Programming Languages +
  • 13 Other Programming Languages -
  • 14 Concluding Remarks - -
  • A Language Codes -
  • B Country Codes -
  • Program Index -
  • Option Index -
  • Variable Index -
  • PO Mode Index -
  • Autoconf Macro Index -
  • General Index +
  • 14 Concluding Remarks + +
  • A Language Codes +
  • B Country Codes +
  • Program Index +
  • Option Index +
  • Variable Index +
  • PO Mode Index +
  • Autoconf Macro Index +
  • General Index

    -This document was generated on 7 March 2002 using the +This document was generated on 24 April 2002 using the texi2html translator version 1.52a.

    diff --git a/doc/iso-639.texi b/doc/iso-639.texi index 24fe2f01a..b007b4adb 100644 --- a/doc/iso-639.texi +++ b/doc/iso-639.texi @@ -116,6 +116,8 @@ Indonesian (formerly in). Interlingue. @item ik Inupiak. +@item io +Ido. @item is Icelandic. @item it @@ -124,7 +126,7 @@ Italian. Inuktitut. @item ja Japanese. -@item jw +@item jv Javanese. @item ka Georgian. @@ -314,6 +316,8 @@ Uzbek. Vietnamese. @item vo Volap@"{u}k; Volapuk. +@item wa +Walloon. @item wo Wolof. @item xh diff --git a/doc/version.texi b/doc/version.texi index 450d73e5a..bcf990e62 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 5 March 2002 -@set UPDATED-MONTH March 2002 -@set EDITION 0.11.1 -@set VERSION 0.11.1 +@set UPDATED 22 April 2002 +@set UPDATED-MONTH April 2002 +@set EDITION 0.11.2 +@set VERSION 0.11.2 diff --git a/man/bind_textdomain_codeset.3 b/man/bind_textdomain_codeset.3 index d451be0bb..37cf23231 100644 --- a/man/bind_textdomain_codeset.3 +++ b/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.11.1" +.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11.2" .SH NAME bind_textdomain_codeset \- set encoding of message translations .SH SYNOPSIS diff --git a/man/bindtextdomain.3 b/man/bindtextdomain.3 index 4b56a286f..ad617a983 100644 --- a/man/bindtextdomain.3 +++ b/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.11.1" +.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.2" .SH NAME bindtextdomain \- set directory containing message catalogs .SH SYNOPSIS diff --git a/man/gettext.3 b/man/gettext.3 index ab343d968..391bcc4a6 100644 --- a/man/gettext.3 +++ b/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.11.1" +.TH GETTEXT 3 "May 2001" "GNU gettext 0.11.2" .SH NAME gettext, dgettext, dcgettext \- translate message .SH SYNOPSIS diff --git a/man/msgattrib.1 b/man/msgattrib.1 index 4e488f1ac..75d04e449 100644 --- a/man/msgattrib.1 +++ b/man/msgattrib.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGATTRIB "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGATTRIB "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgattrib \- attribute matching and manipulation on message catalog .SH SYNOPSIS @@ -92,6 +92,10 @@ write out strict Uniforum conforming .po file \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgattrib.1.html b/man/msgattrib.1.html index 8c7e4ffc6..dae8ee196 100644 --- a/man/msgattrib.1.html +++ b/man/msgattrib.1.html @@ -372,6 +372,19 @@ write out strict Uniforum conforming .po file set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgcat.1 b/man/msgcat.1 index 2d4662c1b..ccdac593b 100644 --- a/man/msgcat.1 +++ b/man/msgcat.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCAT "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGCAT "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgcat \- combines several message catalogs .SH SYNOPSIS @@ -85,6 +85,10 @@ write out strict Uniforum conforming .po file \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgcat.1.html b/man/msgcat.1.html index 694983466..c2afdb76b 100644 --- a/man/msgcat.1.html +++ b/man/msgcat.1.html @@ -305,6 +305,19 @@ write out strict Uniforum conforming .po file
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgcmp.1 b/man/msgcmp.1 index 36423d323..14bacd7fe 100644 --- a/man/msgcmp.1 +++ b/man/msgcmp.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCMP "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGCMP "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgcmp \- compare message catalog and template .SH SYNOPSIS diff --git a/man/msgcomm.1 b/man/msgcomm.1 index 73ffd4d8d..f8ff982a9 100644 --- a/man/msgcomm.1 +++ b/man/msgcomm.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCOMM "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGCOMM "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgcomm \- match two message catalogs .SH SYNOPSIS @@ -77,6 +77,10 @@ write out strict Uniforum conforming .po file \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgcomm.1.html b/man/msgcomm.1.html index 048be5818..e5676119a 100644 --- a/man/msgcomm.1.html +++ b/man/msgcomm.1.html @@ -278,6 +278,19 @@ write out strict Uniforum conforming .po file
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgconv.1 b/man/msgconv.1 index 28e836ebc..3fa679191 100644 --- a/man/msgconv.1 +++ b/man/msgconv.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGCONV "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGCONV "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgconv \- character set conversion for message catalog .SH SYNOPSIS @@ -59,6 +59,10 @@ strict Uniforum output style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgconv.1.html b/man/msgconv.1.html index 6c0962e87..c284436b8 100644 --- a/man/msgconv.1.html +++ b/man/msgconv.1.html @@ -239,6 +239,19 @@ strict Uniforum output style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgen.1 b/man/msgen.1 index e137a687e..a15ee3ff5 100644 --- a/man/msgen.1 +++ b/man/msgen.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEN "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGEN "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgen \- create English message catalog .SH SYNOPSIS @@ -56,6 +56,10 @@ strict Uniforum output style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgen.1.html b/man/msgen.1.html index 1300e67eb..519996197 100644 --- a/man/msgen.1.html +++ b/man/msgen.1.html @@ -215,6 +215,19 @@ strict Uniforum output style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgexec.1 b/man/msgexec.1 index d38cf86ce..75b9a3be3 100644 --- a/man/msgexec.1 +++ b/man/msgexec.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGEXEC "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGEXEC "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgexec \- process translations of message catalog .SH SYNOPSIS diff --git a/man/msgfilter.1 b/man/msgfilter.1 index 0a8c6ba51..d04bd4edb 100644 --- a/man/msgfilter.1 +++ b/man/msgfilter.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFILTER "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGFILTER "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgfilter \- edit translations of message catalog .SH SYNOPSIS @@ -70,6 +70,10 @@ strict Uniforum output style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgfilter.1.html b/man/msgfilter.1.html index ced988476..f2bcd35e8 100644 --- a/man/msgfilter.1.html +++ b/man/msgfilter.1.html @@ -278,6 +278,19 @@ strict Uniforum output style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgfmt.1 b/man/msgfmt.1 index b96e2ae06..4d6a11ea9 100644 --- a/man/msgfmt.1 +++ b/man/msgfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGFMT "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGFMT "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgfmt \- compile message catalog to binary format .SH SYNOPSIS diff --git a/man/msggrep.1 b/man/msggrep.1 index 9662a967e..85056778f 100644 --- a/man/msggrep.1 +++ b/man/msggrep.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGGREP "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGGREP "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msggrep \- pattern matching on message catalog .SH SYNOPSIS @@ -100,6 +100,10 @@ strict Uniforum output style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msggrep.1.html b/man/msggrep.1.html index 536c398fb..a7ed13648 100644 --- a/man/msggrep.1.html +++ b/man/msggrep.1.html @@ -377,6 +377,19 @@ strict Uniforum output style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msginit.1 b/man/msginit.1 index 0c2b3b83d..d1b708644 100644 --- a/man/msginit.1 +++ b/man/msginit.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGINIT "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGINIT "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msginit \- initialize a message catalog .SH SYNOPSIS @@ -36,6 +36,10 @@ assume the PO file is automatically generated .TP \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width +.TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines .SS "Informative output:" .TP \fB\-h\fR, \fB\-\-help\fR diff --git a/man/msginit.1.html b/man/msginit.1.html index e698a6292..a11afef50 100644 --- a/man/msginit.1.html +++ b/man/msginit.1.html @@ -144,6 +144,19 @@ assume the PO file is automatically generated
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgmerge.1 b/man/msgmerge.1 index 65b0248f4..93dace9f2 100644 --- a/man/msgmerge.1 +++ b/man/msgmerge.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGMERGE "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGMERGE "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgmerge \- merge message catalog and template .SH SYNOPSIS @@ -102,6 +102,10 @@ strict Uniforum output style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msgmerge.1.html b/man/msgmerge.1.html index 95cfdb981..84bc2a845 100644 --- a/man/msgmerge.1.html +++ b/man/msgmerge.1.html @@ -375,6 +375,19 @@ strict Uniforum output style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msgunfmt.1 b/man/msgunfmt.1 index f105a5054..ed83754af 100644 --- a/man/msgunfmt.1 +++ b/man/msgunfmt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNFMT "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGUNFMT "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msgunfmt \- uncompile message catalog from binary format .SH SYNOPSIS @@ -71,6 +71,10 @@ write strict uniforum style \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .SS "Informative output:" diff --git a/man/msgunfmt.1.html b/man/msgunfmt.1.html index 5da8f18cb..2ee4c09a0 100644 --- a/man/msgunfmt.1.html +++ b/man/msgunfmt.1.html @@ -285,6 +285,19 @@ write strict uniforum style
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/msguniq.1 b/man/msguniq.1 index 7d01dbe9a..cab6ddd0e 100644 --- a/man/msguniq.1 +++ b/man/msguniq.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH MSGUNIQ "1" "March 2002" "GNU gettext 0.11" GNU +.TH MSGUNIQ "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME msguniq \- unify duplicate translations in message catalog .SH SYNOPSIS @@ -74,6 +74,10 @@ write out strict Uniforum conforming .po file \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/msguniq.1.html b/man/msguniq.1.html index 7c4fe3a35..29c9e15b5 100644 --- a/man/msguniq.1.html +++ b/man/msguniq.1.html @@ -278,6 +278,19 @@ write out strict Uniforum conforming .po file
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/man/ngettext.3 b/man/ngettext.3 index 351c59cbe..b0f204422 100644 --- a/man/ngettext.3 +++ b/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.11.1" +.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11.2" .SH NAME ngettext, dngettext, dcngettext \- translate message and choose plural form .SH SYNOPSIS diff --git a/man/textdomain.3 b/man/textdomain.3 index 9030d39c3..141ca93e3 100644 --- a/man/textdomain.3 +++ b/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.11.1" +.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11.2" .SH NAME textdomain \- set domain for future gettext() calls .SH SYNOPSIS diff --git a/man/xgettext.1 b/man/xgettext.1 index 7cc46802a..c518e0167 100644 --- a/man/xgettext.1 +++ b/man/xgettext.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. -.TH XGETTEXT "1" "March 2002" "GNU gettext 0.11" GNU +.TH XGETTEXT "1" "April 2002" "GNU gettext 0.11.2" GNU .SH NAME xgettext \- extract gettext strings from source .SH SYNOPSIS @@ -99,6 +99,10 @@ write out strict Uniforum conforming .po file \fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR set output page width .TP +\fB\-\-no\-wrap\fR +do not break long message lines, longer than +the output page width, into several lines +.TP \fB\-s\fR, \fB\-\-sort\-output\fR generate sorted output .TP diff --git a/man/xgettext.1.html b/man/xgettext.1.html index d3571a123..d67fb8e30 100644 --- a/man/xgettext.1.html +++ b/man/xgettext.1.html @@ -386,6 +386,19 @@ write out strict Uniforum conforming .po file
    set output page width + + +
    +--no-wrap
    + + + +
    +do not break long message lines, longer than the output page +width, into several lines
    + diff --git a/po/ca.gmo b/po/ca.gmo index c19c01eab..4a1bae1fa 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index c72581c79..6983d6199 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-18 01:43+0100\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "Els arguments vàlids són:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error en obrir «%s» per llegir" @@ -252,11 +252,11 @@ msgstr "" "les especificacions de format en «msgid» i «%s» de l'argument «%s» no són " "les mateixes" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -268,16 +268,16 @@ msgstr "" "de còpia. No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n" "ADEQUACIÓ A UN PROPÒSIT PARTICULAR.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Escrit per %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "sobren arguments" @@ -285,11 +285,11 @@ msgstr "sobren arguments" msgid "missing arguments" msgstr "manquen arguments" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu «%s --help» per obtenir més informació.\n" @@ -351,15 +351,15 @@ msgstr "" "els missatges que troba en el catàleg seleccionat.\n" "Directori estàndard de recerca: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Informeu dels errors a .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Forma d'ús: %s [OPCIÓ]\n" @@ -384,9 +384,9 @@ msgstr "" " completament qualificat i els àlies\n" " -i, --ip-address adreces corresponents al nom d'estació\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -401,28 +401,28 @@ msgstr "" msgid "could not get host name" msgstr "no s'ha pogut obtenir el nom d'estació" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "es permet com a molt un fitxer d'entrada" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "«%s» i «%s» són mútuament excloents" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -431,17 +431,17 @@ msgstr "" "Filtra els missatges d'un catàleg de traduccions segons els seus atributs,\n" "i manipula aquests atributs.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Els arguments obligatoris per les opcions llargues també ho són\n" "per les opcions curtes corresponents.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -456,8 +456,8 @@ msgstr "" "Si no s'especifica cap fitxer d'entrada, o si aquest és «-», es llegirà\n" "l'entrada estàndard.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -470,7 +470,7 @@ msgstr "" "Els resultats s'escriuran en l'eixida estàndard si no s'especifica cap\n" "fitxer d'eixida, o si aquest és «-».\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -491,7 +491,7 @@ msgstr "" " --no-obsolete elimina els missatges obsolets (#~)\n" " --only-obsolete manté els missatges obsolets (#~)\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -510,8 +510,8 @@ msgstr "" " --fuzzy sinònim de «--only-fuzzy --clear-fuzzy»\n" " --obsolete sinònim de «--only-obsolete --clear-obsolete»\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -522,6 +522,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -541,12 +543,12 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "s'ha especificat un criteri de selecció impossible (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]...\n" @@ -554,7 +556,7 @@ msgstr "Forma d' # ivb (2001/12/24) # ivb Aquesta traducció no és completament literal però queda més clar. # ivb Amb «commonality» vol dir «nombre de coincidències». -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -577,7 +579,7 @@ msgstr "" "«--use-first», en el qual cas es treuran del primer fitxer PO que els\n" "definesca. Les posicions de fitxer de tots els fitxers PO s'acumularan.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -594,7 +596,7 @@ msgstr "" " de fitxers d'entrada\n" "Si el fitxer d'entrada és «-» es llegirà l'entrada estàndard.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -607,7 +609,7 @@ msgstr "" "Els resultats s'escriuran en l'eixida estàndard si no s'especifica cap\n" "fitxer d'eixida, o si aquest és «-».\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -627,8 +629,8 @@ msgstr "" " -u, --unique abreviatura de «--less-than=2», fa que\n" " només s'escriguen els missatges únics\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -642,6 +644,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -664,7 +668,7 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -675,15 +679,15 @@ msgstr "" " -h, --help mostra aquesta ajuda i ix\n" " -V, --version mostra informació sobre la versió i ix\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "no s'ha especificat cap fitxer d'entrada" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "es necessiten exactament 2 fitxers d'entrada" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Forma d'ús: %s [OPCIÓ] def.po ref.pot\n" @@ -720,7 +724,7 @@ msgstr "" " -D, --directory=DIRECTORI afig el DIRECTORI a la llista de recerca\n" " de fitxers d'entrada\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -730,15 +734,15 @@ msgstr "" " -m, --multi-domain aplica «ref.pot» a cadascun dels dominis\n" " de «def.po»\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "aquest missatge s'usa però no s'ha definit..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...però aquesta definició és similar" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "aquest missatge s'usa però no s'ha definit en «%s»" @@ -762,14 +766,14 @@ msgstr "la definici msgid "...this is the location of the first definition" msgstr "...aquesta és la ubicació de la primera definició" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "cal que especifiqueu almenys dos fitxers" # ivb (2001/12/24) # ivb Aquesta traducció no és completament literal però queda més clar. # ivb Amb «commonality» vol dir «nombre de coincidències». -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -790,7 +794,7 @@ msgstr "" "fitxer PO que els definesca. Les posicions de fitxer de tots els fitxers\n" "PO s'acumularan.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -810,8 +814,8 @@ msgstr "" " -u, --unique abreviatura de «--less-than=2», fa que\n" " només s'escriguen els missatges únics\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -822,6 +826,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -844,12 +850,12 @@ msgstr "" " --omit-header no escriu la capçalera amb l'entrada\n" " «msgid \"\"»\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Converteix un catàleg de traduccions a una codificació de caràcters diferent.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -860,8 +866,8 @@ msgstr "" " -t, --to-code=NOM codificació de l'eixida\n" "La codificació per defecte és la del locale actual.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -872,6 +878,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -891,20 +899,20 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "no s'ha especificat cap fitxer d'entrada" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "es necessita exactament un fitxer d'entrada" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Forma d'ús: %s [OPCIÓ] FITXERENTRADA\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -917,7 +925,7 @@ msgstr "" "«xgettext»). S'assignarà a les entrades no traduïdes una traducció igual\n" "al «msgid» corresponent, i es marcaran amb «fuzzy».\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -964,7 +972,7 @@ msgstr "" "L'ordre incorporada «0» genera la traducció seguida d'un octet nul.\n" "L'eixida de «msgexec 0» és adequada com a entrada per «xargs -0».\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -983,30 +991,30 @@ msgstr "" msgid "write to stdout failed" msgstr "no s'ha pogut escriure en l'eixida estàndard" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "no s'ha pogut escriure al subprocés «%s»" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "manca el nom d'un filtre" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "cal que especifiqueu almenys un guió de «sed»" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Forma d'ús: %s [OPCIÓ] FILTRE [OPCIÓ-DE-FILTRE]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Aplica un filtre a cada traducció d'un catàleg de traduccions.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1015,7 +1023,7 @@ msgstr "" "El FILTRE pot ser qualsevol programa que llija una traducció de l'entrada\n" "estàndard i n'escriga una de modificada en l'eixida estàndard.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1031,8 +1039,8 @@ msgstr "" " -n, --quiet, --silent evita la impressió automàtica de l'espai\n" " del patró\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1044,6 +1052,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1063,22 +1073,22 @@ msgstr "" " -s, --sort-output genera una eixida ordenada\n" " -F, --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "no s'ha pogut establir una E/S no blocant amb el subprocés «%s»" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "la comunicació amb el subprocés «%s» ha fallat" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "no s'ha pogut llegir del subprocés «%s»" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "el subprocés «%s» ha terminat amb codi d'eixida %d" @@ -1088,20 +1098,20 @@ msgstr "el subproc msgid "the argument to %s should be a single punctuation character" msgstr "cal que l'argument de «%s» siga un sol caràcter de puntuació" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "«%s» necessita una especificació «-d directori»" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "«%s» necessita una especificació «-l locale»" # ivb (2001/12/26) # ivb Els «%s» es refereixen a opcions -> femení. -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "«%s» només és vàlida amb «%s»" @@ -1485,12 +1495,12 @@ msgstr "es descarta l'entrada msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: avís: el fitxer font conté una traducció difusa" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "no es pot usar l'opció «%c» abans d'especificar «K» o «T»" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1499,7 +1509,7 @@ msgstr "" "Extrau d'un catàleg de traduccions tots els missatges que concorden amb\n" "un patró especificat o que pertanyen a uns fitxers font indicats.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1560,8 +1570,8 @@ msgstr "" " -f, --file=FITXER obté el PATRÓ del FITXER\n" " -i, --ignore-case no diferencia entre majúscules i minúscules\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1572,6 +1582,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1591,11 +1603,11 @@ msgstr "" " --sort-output genera una eixida ordenada\n" " --sort-by-file ordena l'eixida pels noms de fitxer\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "no s'ha pogut escriure al subprocés «grep»" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1605,7 +1617,7 @@ msgstr "" "de la vostra variable d'entorn «LANG», tal i com es descriu en el fitxer\n" "«ABOUT-NLS». Açò cal per a que pugueu comprovar les vostres traduccions.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1616,12 +1628,12 @@ msgstr "" "Per favor, especifiqueu el locale amb l'opció «--locale»\n" "o el fitxer PO d'eixida amb l'opció «--output-file».\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "S'ha creat «%s».\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1630,7 +1642,7 @@ msgstr "" "Crea un fitxer PO nou, inicialitzant-ne la metainformació amb valors\n" "de l'entorn de la usuària/l'usuari.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1644,7 +1656,7 @@ msgstr "" "directori actual. Si el fitxer d'entrada és «-» es llegirà l'entrada\n" "estàndard.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1658,13 +1670,15 @@ msgstr "" "«--locale» o de la configuració de locale de la usuària/l'usuari.\n" "Si és «-», els resultats s'escriuran en l'eixida estàndard.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Detalls de l'eixida:\n" " -l, --locale=LL_PP estableix el locale destinació\n" @@ -1672,7 +1686,7 @@ msgstr "" " automàticament\n" " -w, --width=NÚMERO estableix l'ample de pàgina de l'eixida\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1680,11 +1694,11 @@ msgstr "" "S'ha trobat més d'un fitxer «.pot».\n" "Per favor, especifiqueu el fitxer POT d'entrada amb l'opció «--input».\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "error en llegir el directori actual" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1692,23 +1706,23 @@ msgstr "" "No s'ha trobat cap fitxer «.pot» en el directori actual.\n" "Per favor, especifiqueu el fitxer POT d'entrada amb l'opció «--input».\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "ha fallat fdopen()" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "error d'E/S amb el subprocés «%s»" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "el subprocés «%s» ha fallat amb codi d'eixida %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1724,7 +1738,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Traduccions al català del paquet «%s»" @@ -1763,7 +1777,7 @@ msgstr "" "el joc de caràcters destinació, «%s», no és un nom portable de codificació" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "avís: " @@ -1884,11 +1898,11 @@ msgstr "" "No es pot convertir de «%s» en «%s». %s es basa en iconv(). Aquesta versió " "ha estat construïda sense iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "tipus de còpia de seguretat" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1912,7 +1926,7 @@ msgstr "" "de fitxer seran preservades. Quan no es puga trobar una coincidència\n" "exacta s'usarà una comparació difusa per produir uns resultats millors.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1930,7 +1944,7 @@ msgstr "" " -C, --compendium=FITXER biblioteca addicional de traduccions de\n" " missatges, es pot especificar diverses voltes\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1941,7 +1955,7 @@ msgstr "" " -U, --update actualitza «def.po»,\n" " no fa res si «def.po» ja es troba actualitzat\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1972,7 +1986,7 @@ msgstr "" "El sufix de còpia de seguretat és «~», a no ser que s'establesca amb\n" "«--suffix» o amb la variable d'entorn «SIMPLE_BACKUP_SUFFIX».\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1987,11 +2001,11 @@ msgstr "" " -v, --verbose augmenta el nivell de descripció\n" " -q, --quiet, --silent no mostra els indicadors de progrés\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "cal definir formes plurals d'aquest missatge" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "no s'han de definir formes plurals d'aquest missatge" @@ -1999,7 +2013,7 @@ msgstr "no s'han de definir formes plurals d'aquest missatge" # ivb Pense que «aprofitades» queda més clar que «mesclades»; es refereix # ivb a les traduccions obteses directament de «def.po». El primer «%s» és # ivb (o no) una nova línia. -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2010,28 +2024,28 @@ msgstr "" # ivb (2002/01/08) # ivb Indica el final del processament, el gènere i nombre no són importants. -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " fet.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "«%s» i els noms explícits de fitxer són mútuament excloents" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Forma d'ús: %s [OPCIÓ] [FITXER]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "Converteix un catàleg binari de missatges en un fitxer PO d'estil Uniforum.\n" # ivb (2002/03/14) # ivb Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl. -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -2044,7 +2058,7 @@ msgstr "" " --tcl mode Tcl: l'entrada és un fitxer «.msg»\n" " de «msgcat» de Tcl\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -2056,7 +2070,7 @@ msgstr "" "Si no s'especifica cap fitxer d'entrada, o si aquest és «-», es llegirà\n" "l'entrada estàndard.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -2072,7 +2086,7 @@ msgstr "" "recurs, separats per un caràcter de subratllat. La classe es trobarà\n" "fent servir el camí a les classes, «CLASSPATH».\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2087,7 +2101,7 @@ msgstr "" "Les opcions «-l» i «-d» són obligatòries. El fitxer «.msg» es cercarà sota\n" "el directori especificat.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2100,8 +2114,8 @@ msgstr "" "Els resultats s'escriuran en l'eixida estàndard si no s'especifica cap\n" "fitxer d'eixida, o si aquest és «-».\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2110,6 +2124,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Detalls de l'eixida:\n" @@ -2124,7 +2140,7 @@ msgstr "" " -w, --width=NÚMERO estableix l'ample de pàgina de l'eixida\n" " -s, --sort-output genera una eixida ordenada\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2137,7 +2153,7 @@ msgstr "" " -V, --version mostra informació sobre la versió i ix\n" " -v, --verbose augmenta el nivell de descripció\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2160,7 +2176,7 @@ msgstr "" "de fitxer s'acumularan. Quan useu l'opció «--unique» es descartaran\n" "els duplicats.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2334,7 +2350,7 @@ msgstr "la forma plural t msgid "too many errors, aborting" msgstr "hi ha massa errors, avortant" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "la seqüència multioctet no és vàlida" @@ -2436,7 +2452,7 @@ msgstr " msgid "failed to create \"%s\"" msgstr "no s'ha pogut crear «%s»" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "error en escriure el fitxer «%s»" @@ -2452,7 +2468,7 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "error en obrir «%s» per escriure" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2460,7 +2476,7 @@ msgstr "" "els missatges internacionalitzats no han de contenir la seqüència d'escapada " "«%c»" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2474,12 +2490,12 @@ msgstr "" "«msgid» purament ASCII en comptes d'aquest.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "no s'ha pogut crear el fitxer d'eixida «%s»" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "eixida estàndard" @@ -2494,7 +2510,7 @@ msgstr "%s:%d: av msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: avís: el literal cadena no és terminat" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "aquest fitxer no ha de contenir directives «domain»" @@ -2513,26 +2529,26 @@ msgstr "%s:%d: manca un n msgid "%s:%d: invalid string expression" msgstr "%s:%d: l'expressió de cadena no és vàlida" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "no es pot usar «--join-existing» quan s'escriu en l'eixida estàndard" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "«xgettext» no funciona sense paraules clau que cercar" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "avís: l'extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb «C»" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extreu les cadenes traduïbles dels fitxers d'entrada especificats.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2541,7 +2557,7 @@ msgstr "" "Els arguments obligatoris per les opcions llargues també ho són per les\n" "opcions curtes corresponents. El mateix ocorre amb els arguments opcionals.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2558,7 +2574,7 @@ msgstr "" " el DIRECTORI\n" "Si el fitxer d'eixida és «-» s'escriurà en l'eixida estàndard.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2577,7 +2593,7 @@ msgstr "" "Per defecte s'endevina el llenguatge fent servir l'extensió del nom\n" "del fitxer d'entrada.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2595,7 +2611,7 @@ msgstr "" " (o aquells que precedeixen les línies amb\n" " una paraula clau) en el fitxer d'eixida\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2614,8 +2630,8 @@ msgstr "" " --debug escriu unes marques més detallades\n" " de reconeixement de cadenes de format\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2626,6 +2642,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2660,13 +2678,13 @@ msgstr "" " -M, --msgstr-suffix[=CADENA] usa la CADENA o «» com a sufix de\n" " les entrades «msgstr»\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrada estàndard" # ivb (2002/01/09) # ivb Em sembla que açò és «no-wrap». -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2676,7 +2694,7 @@ msgstr "" "«gettext(\"\")» retorna l'entrada de capçalera amb metainformació,\n" "no la cadena buida.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "el llenguatge «%s» no és conegut" diff --git a/po/cs.gmo b/po/cs.gmo index 352c232e3..c012aedcd 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 51498048e..60b8cedd7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.38\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-08-18 15:22+0200\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -39,7 +39,7 @@ 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 #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "chyba pøi otevírání souboru \"%s\" pro ètení" @@ -278,11 +278,11 @@ msgstr "form # 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -296,17 +296,17 @@ msgstr "" # 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/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Autor: %s\n" # src/gettextp.c:164 -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "pøíli¹ mnoho argumentù" @@ -317,11 +317,11 @@ msgstr "chyb # 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/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Více informací získáte pøíkazem `%s --help'.\n" @@ -387,11 +387,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/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "" @@ -399,7 +399,7 @@ msgstr "" "(pouze\n" "anglicky), pøipomínky k pøekladu zasílejte na adresu (èesky).\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -419,9 +419,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -433,44 +433,44 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" # src/xgettext.c:378 src/xgettext.c:382 -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s a %s se vzájemnì vyluèují" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -479,8 +479,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -489,7 +489,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -501,7 +501,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -514,7 +514,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -526,6 +526,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -551,17 +553,17 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, 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:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -590,7 +592,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -600,7 +602,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -609,7 +611,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -638,7 +640,7 @@ msgstr "" "v souborech bude ponecháno ze v¹ech .po souborù.\n" # src/msgmerge.c:303 -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -653,6 +655,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -678,7 +682,7 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -687,16 +691,16 @@ msgid "" msgstr "" # src/msgcmp.c:160 src/msgmerge.c:267 -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "vstupní soubory nejsou zadány" # src/msgcmp.c:165 src/msgmerge.c:272 -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "jsou po¾adovány pøesnì 2 vstupní soubory" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -736,7 +740,7 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -744,17 +748,17 @@ msgid "" msgstr "" # src/msgcmp.c:259 src/msgmerge.c:711 -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 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:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ale tato definice je podobná" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, 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" @@ -783,11 +787,11 @@ msgstr "dvojn msgid "...this is the location of the first definition" msgstr "...toto je umístìní první definice" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "musí být zadány nejménì dva rùzné soubory" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -815,7 +819,7 @@ 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:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -844,7 +848,7 @@ msgstr "" "v souborech bude ponecháno ze v¹ech .po souborù.\n" # src/msgmerge.c:303 -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -856,6 +860,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -882,12 +888,12 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -896,7 +902,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -908,6 +914,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -934,22 +942,22 @@ msgstr "" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" # src/msgfmt.c:273 src/xgettext.c:410 -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "vstupní soubor není zadán" # src/msgcmp.c:165 src/msgmerge.c:272 -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "jsou po¾adovány pøesnì 2 vstupní soubory" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -958,7 +966,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -995,7 +1003,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -1008,40 +1016,40 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" # src/gettextp.c:154 -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "chybí argumenty" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "musí být zadány nejménì dva rùzné soubory" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1052,7 +1060,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1065,6 +1073,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1090,22 +1100,22 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1115,18 +1125,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1471,19 +1481,19 @@ msgstr "ne msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1515,7 +1525,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1527,6 +1537,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1552,18 +1564,18 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1571,19 +1583,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1592,7 +1604,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1601,48 +1613,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1654,7 +1668,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1688,7 +1702,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 #, fuzzy msgid "warning: " msgstr "%s: upozornìní: " @@ -1773,12 +1787,12 @@ msgstr "" "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n" "Tato verze byla kompilována bez iconv().\n" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" # src/msgmerge.c:321 -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1803,7 +1817,7 @@ msgstr "" "základì podobnosti vzorù. Tím je dosa¾eno lep¹ího slití obou katalogù.\n" " Není-li výstupní soubor urèen, výsledek bude vypisován na standardní výstup.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1814,7 +1828,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1822,7 +1836,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1839,7 +1853,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1850,19 +1864,19 @@ msgid "" msgstr "" # src/msgcmp.c:267 src/msgmerge.c:740 -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy 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:953 +#: src/msgmerge.c:960 #, fuzzy 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:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1872,27 +1886,27 @@ msgstr "" "chybí %ld, zastaralých %ld.\n" # src/msgmerge.c:775 -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " dokonèeno.\n" # src/xgettext.c:378 src/xgettext.c:382 -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s a %s se vzájemnì vyluèují" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1900,7 +1914,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1908,7 +1922,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1918,7 +1932,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1928,7 +1942,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1938,7 +1952,7 @@ msgid "" msgstr "" # src/msgunfmt.c:215 -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1948,6 +1962,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Pou¾ití: %s [PØEPÍNAÈ] [SOUBOR]...\n" @@ -1965,7 +1981,7 @@ msgstr "" " -V, --version vypí¹e oznaèení verze a ukonèí se\n" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1974,7 +1990,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1987,7 +2003,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2149,7 +2165,7 @@ msgstr "mno msgid "too many errors, aborting" msgstr "pøíli¹ mnoho chyb, konèím" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "neplatná víceznaková sekvence" @@ -2265,7 +2281,7 @@ msgid "failed to create \"%s\"" msgstr "" # src/message.c:1182 -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "chyba pøi zápisu do souboru \"%s\"" @@ -2281,13 +2297,13 @@ 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:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2297,13 +2313,13 @@ msgid "" msgstr "" # src/message.c:1115 -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "výstupní soubor \"%s\" nelze vytvoøit" # src/message.c:1122 -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standardní výstup" @@ -2321,7 +2337,7 @@ msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù" # src/xgettext.c:658 src/xgettext.c:968 -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu" @@ -2341,33 +2357,33 @@ msgid "%s:%d: invalid string expression" msgstr "" # src/xgettext.c:386 -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 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:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2377,7 +2393,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2389,7 +2405,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2399,7 +2415,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2411,7 +2427,7 @@ msgid "" msgstr "" # src/msgmerge.c:303 -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2423,6 +2439,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2454,11 +2472,11 @@ msgstr "" " -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n" # src/xget-lex.c:150 -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standardní vstup" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2466,7 +2484,7 @@ msgid "" msgstr "" # src/xgettext.c:1342 -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "jazyk `%s' není znám" diff --git a/po/da.gmo b/po/da.gmo index 14185db29..8f2a14bac 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index d0cd8d4ff..2df84596b 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-27 19:32+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "Gyldige argumenter er:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fejl ved læse-åbning af '%s'" @@ -247,11 +247,11 @@ msgid "" msgstr "" "formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -263,16 +263,16 @@ msgstr "" "INGEN garanti; heller ikke for SALGBARHED eller EGNETHED FOR NOGET SÆRLIGT\n" "FORMÅL.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Skrevet af %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "For mange argumenter" @@ -280,11 +280,11 @@ msgstr "For mange argumenter" msgid "missing arguments" msgstr "argumenter mangler" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for yderligere oplysninger.\n" @@ -344,15 +344,15 @@ msgstr "" "oversættes de tekster der findes i det valgte tekstkatalog.\n" "Standard-filkataloget for søgning er: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Rapportér fejl på engelsk til .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Brug: %s [TILVALG]\n" @@ -376,9 +376,9 @@ msgstr "" " -f, --fqdn, --long langt værtsnavn, indholder hele domænenavnet og alias\n" " -i, --ip-address adresser for værtsnavnet\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -393,28 +393,28 @@ msgstr "" msgid "could not get host name" msgstr "kunne ikke hente værtsnavn" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "Højst én inddatalinje tilladt" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s udelukker hinanden" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -423,17 +423,17 @@ msgstr "" "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n" "manipulerer attributterne.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Hvis et langt tilvalg kræver et argument, gælder det også for det tilsvarende\n" "korte tilvalg.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -446,8 +446,8 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis ingen inddatafil er angivet eller den er -, læses fra standard-inddata.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -460,7 +460,7 @@ msgstr "" "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n" "eller hvis den er angivet som - .\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -479,7 +479,7 @@ msgstr "" " --no-obsolete fjern forældede #~ beskeder\n" " --only-obsolete behold forældede #~ beskeder\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -498,8 +498,8 @@ msgstr "" " --fuzzy samme som --only-fuzzy --clear-fuzzy\n" " --obsolete samme som --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -510,6 +510,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -525,17 +527,17 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -557,7 +559,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -572,7 +574,7 @@ msgstr "" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" "Hvis inddatafilen er -, læses fra standard-inddata.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -585,7 +587,7 @@ msgstr "" "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet\n" "eller hvis den er angivet som - .\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -605,8 +607,8 @@ msgstr "" " -u, --unique kort skrivemåde for --less-than=2, foranlediger\n" " at kun unikke beskeder udskrives\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -620,6 +622,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -638,7 +642,7 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -649,15 +653,15 @@ msgstr "" " -h, --help vis denne hjælp og afslut\n" " -V, --version vis versionsinformation og afslut\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ingen filer angivet som inddata" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "der kræves netop to inddatafiler" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n" @@ -694,7 +698,7 @@ msgstr "" " ref.pot referencer til kildeteksterne\n" " -D, --directory=FILKATALOG gennemsøg også FILKATALOG efter inddatafiler\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -703,15 +707,15 @@ msgstr "" "Bearbejdningsvarianter:\n" " -m, --multi-domain brug ref.pot til hvert domæne i def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "denne tekst bruges, men er ikke erklæret..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...men denne tekst ligner" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "denne tekst er brugt, men ikke erklæret i %s" @@ -735,11 +739,11 @@ msgstr "tekst erkl msgid "...this is the location of the first definition" msgstr "... her er den første erklæring" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "Mindst to filer skal angives" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -759,7 +763,7 @@ 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:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -779,8 +783,8 @@ msgstr "" " -u, --unique kort skrivemåde for --less-than=2, foranlediger\n" " at kun unikke beskeder udskrives\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -791,6 +795,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -808,12 +814,12 @@ msgstr "" " -F, --sort-by-file sortér uddata efter filplacering\n" " --omit-header udskriv ikke header med 'msgid \"\"' indgang\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -824,8 +830,8 @@ msgstr "" " -t, --to-code=NAVN Kodning for uddata\n" "Standardværdi er nuværende locales kodning.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -836,6 +842,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -851,20 +859,20 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "ingen inddatafil angivet" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "der kræves præcist én inddatafil" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Brug: %s [FLAG] INDFIL\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -877,7 +885,7 @@ msgstr "" "Uoversatte poster gives en oversættelse som er identisk med msgid og\n" "markeres som uafklaret.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -924,7 +932,7 @@ msgstr "" "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n" "\"xargs -O\"\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -941,30 +949,30 @@ msgstr "" msgid "write to stdout failed" msgstr "skrivning til standard ud mislykkedes" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "skrivning til %s-underproces mislykkedes" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "filternavn mangler" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "mindst et sed-skript skal angives" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap 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:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -973,7 +981,7 @@ 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -988,8 +996,8 @@ msgstr "" " der skal udføres\n" " -n, --quiet, --silent undertryk automatisk udskrift af resultat\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1001,6 +1009,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1017,22 +1027,22 @@ msgstr "" " -s, --sort-output generér sorteret uddata\n" " -F, --sort-by-file sortér uddata efter filplacering\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, 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:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "kommunikation med %s-underproces mislykkedes" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "læsning fra %s-underproces mislykkedes" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s-underproces afsluttede med slutstatus %d" @@ -1042,18 +1052,18 @@ msgstr "%s-underproces afsluttede med slutstatus %d" 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s kræver at \"-d katalog\" angives" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s kræver en \"-l lokale\"-angivelse" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s er kun gyldig med %s" @@ -1403,13 +1413,13 @@ msgid "%s: warning: source file contains fuzzy translation" msgstr "" "%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1418,7 +1428,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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1476,8 +1486,8 @@ msgstr "" " -f, --file=FIL hent MØNSTER fra FIL\n" " -i, --ignore-case versalufølsomt\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1488,6 +1498,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1503,11 +1515,11 @@ msgstr "" " --sort-output generér sorteret uddata\n" " --sort-by-file sortér uddata efter filplacering\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "skrivning til grep-underproces mislykkedes" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1517,7 +1529,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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1528,12 +1540,12 @@ msgstr "" "Angiv locale med flaget --locale eller\n" ".po-udfilen med flaget --output-file.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Oprettede %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1542,7 +1554,7 @@ msgstr "" "Opretter en ny PO-fil og initierer metainformation med værdier fra\n" "brugerens miljøvariabler.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1555,7 +1567,7 @@ 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:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1568,20 +1580,22 @@ msgstr "" "Hvis ingen udfil er angivet, afhænger det af --locale tilvalget eller brugerens\n" "indstilling af locale. Hvis den er - skrives resultaterne på standard ud.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Uddatadetaljer:\n" " -l, --locale=LL_CC sæt mållocale\n" " --no-translator antag at PO-filen er automatgenereret\n" " -w, --width=ANTAL sæt sidebredde for uddata\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1589,11 +1603,11 @@ msgstr "" "Fandt mere end en .pot-fil.\n" "Angiv .pot-indfil med flaget --input.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "fejl ved læsning af aktuelt katalog" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1601,23 +1615,23 @@ msgstr "" "Fandt ingen .pot-fil i aktuelt katalog.\n" "Angiv .pot-indfil med flaget --input.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() mislykkedes" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "I/O-fejl i %s-underproces" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s-underproces fejlede med slutstatus %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1632,7 +1646,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Danske oversættelser for pakke %s" @@ -1668,7 +1682,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "advarsel: " @@ -1771,11 +1785,11 @@ msgstr "" "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(). Denne version " "er bygget uden iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "sikkerhedskopitype" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1799,7 +1813,7 @@ msgstr "" "overensstemmelse, vil 'løs søgning' (fuzzy matching) blive brugt til at give\n" "bedre resultater.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1816,7 +1830,7 @@ msgstr "" " -C, --compendium=FIL yderligere bibliotek af tekst-oversættelser,\n" " kan angives mere end én gang\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1827,7 +1841,7 @@ msgstr "" " -U, --update opdatér def.po,\n" " gør ingenting hvis def.po allerede er opdateret\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1856,7 +1870,7 @@ msgstr "" "Endelse for sikkerhedskopier er \"~\", hvis den ikke sættes med --suffix eller\n" "miljøvariablen SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1871,15 +1885,15 @@ msgstr "" " -v, --verbose forøg udskreven information\n" " -q, --quiet, --silent undertryk indikatorer for fremgang\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "denne tekst burde definere flertalsformer" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "denne tekst burde ikke definere flertalsformer" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1888,26 +1902,26 @@ msgstr "" "%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %" "ld, forældede %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " afsluttet.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og udtrykkelige filnavne udelukker hinanden" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Brug: %s [TILVALG] [FIL]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap 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:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1918,7 +1932,7 @@ msgstr "" " -j, --java Javatilstand: inddata er en Java ResourceBundle-klasse\n" " --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-fil\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1929,7 +1943,7 @@ msgstr "" " FIL ... .mo-infiler\n" "Hvis ingen indfil er givet eller hvis den er - læses standard-ind.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1944,7 +1958,7 @@ 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:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1959,7 +1973,7 @@ msgstr "" "Flagene -l og -d er obligatoriske. .msg-filen skrives\n" "i det opgivne katalog.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1972,8 +1986,8 @@ msgstr "" "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n" "eller hvis den er angivet til - .\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1982,6 +1996,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Detaljer for uddata:\n" @@ -1993,7 +2009,7 @@ msgstr "" " -w, --width=TAL angiv udskrivningsbredde\n" " -s, --sort-output generér sorteret uddata\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2006,7 +2022,7 @@ msgstr "" " -V, --version vis versionsinformation og afslut\n" " -v, --verbose forøg udskreven information\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2028,7 +2044,7 @@ msgstr "" "oversættelse. Filpositioner samles sammen.\n" "Når flaget --unique angives fjernes alle gentagede.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2184,7 +2200,7 @@ msgstr "flertalsform har forkert indeks" msgid "too many errors, aborting" msgstr "afbryder kørslen på grund af for mange fejl" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "Ugyldig multibytesekvens" @@ -2285,7 +2301,7 @@ msgstr "ikke et gyldigt Java-klassenavn: %s" msgid "failed to create \"%s\"" msgstr "kunne ikke oprette '%s'" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "fejl ved skrivning til filen '%s'" @@ -2301,13 +2317,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "fejl opstået ved skrive-åbning af '%s'" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2320,12 +2336,12 @@ msgstr "" "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikke oprette uddatafil '%s'" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard-uddata" @@ -2340,7 +2356,7 @@ msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "denne fil må ikke indeholde 'domain'-kommandoer" @@ -2359,27 +2375,27 @@ msgstr "%s:%d: mangler tal efter #" msgid "%s:%d: invalid string expression" msgstr "%s:%d: ugyldigt streng-udtryk" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Udtræk oversættelige strenge fra givne indfiler.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2389,7 +2405,7 @@ msgstr "" "korte tilvalg.\n" "Tilvarende gælder for valgfri argumenter.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2404,7 +2420,7 @@ msgstr "" " -p, --output-dir=FILKATALOG uddatafiler placeres i FILKATALOG\n" "Hvis uddatafilen er -, skrives uddata til standard-ud.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2422,7 +2438,7 @@ msgstr "" " RST, Glade)\n" " -C, --c++ kort skrivemåde for --language=C++\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2436,7 +2452,7 @@ 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:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2453,8 +2469,8 @@ msgstr "" " -T, --trigraphs forstå ISO C-trigrafer i inddata\n" " --debug mere detaljeret resultat af strenggenkendelse\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2465,6 +2481,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2490,11 +2508,11 @@ msgstr "" " -m, --msgstr-prefix[=STRENG] brug STRING eller \"\" som forstavelse for msgstr-indgange\n" " -M, --msgstr-suffix[=STRENG] brug STRING eller \"\" som endelse for msgstr-indgange\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard-inddata" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2504,7 +2522,7 @@ msgstr "" "gettext(\"\") returnerer hovedet med metainformation,\n" "ikke den tomme streng.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "ukendt sprog `%s'" diff --git a/po/de.gmo b/po/de.gmo index 865c6b995..21ed00512 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index a4dfed6b7..065a1f989 100644 --- a/po/de.po +++ b/po/de.po @@ -75,7 +75,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-13 20:39+0100\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -99,7 +99,7 @@ msgid "Valid arguments are:" msgstr "Gültige Argumente sind:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen" @@ -313,11 +313,11 @@ msgid "" msgstr "" "Formatelemente in »msgid« und »%s« für Argument »%s« stimmen nicht überein" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -329,16 +329,16 @@ msgstr "" "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n" "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Geschrieben von %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "zu viele Argumente" @@ -346,11 +346,11 @@ msgstr "zu viele Argumente" msgid "missing arguments" msgstr "Argumente fehlen" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "»%s --help« gibt weitere Informationen.\n" @@ -414,18 +414,18 @@ msgstr "" "\n" "Standardverzeichnis: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" "Fehler bitte an melden.\n" "\n" "Für die deutsche Übersetzung ist die Mailingliste zuständig.\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Aufruf: %s [OPTION]\n" @@ -450,9 +450,9 @@ msgstr "" " vollqualifizierten Domainnamen (FQDN) und Aliasse\n" " -i, --ip-address Adressen für den Rechnernamen\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -467,28 +467,28 @@ msgstr "" msgid "could not get host name" msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "höchstens eine Eingabedatei erlaubt" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s und %s schließen sich gegenseitig aus" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -497,17 +497,17 @@ msgstr "" "Meldungen eines Katalogs mit Übersetzungen gemäß deren Attribute filtern und\n" "die Attribute verändern.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n" "notwendig.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -521,8 +521,8 @@ msgstr "" "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -535,7 +535,7 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "wenn »-« angegeben ist.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -554,7 +554,7 @@ msgstr "" " --no-obsolete obsolete Meldungen (#~) verwerfen\n" " --only-obsolete obsolete Meldungen (#~) übernehmen\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -573,8 +573,8 @@ msgstr "" " --fuzzy Synonym für »--only-fuzzy --clear-fuzzy«\n" " --obsolete Synonym für »--only-obsolete --clear-obsolete«\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -585,6 +585,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -602,17 +604,17 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erzeugen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Auswahlkriterium nicht möglich (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -637,7 +639,7 @@ msgstr "" "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n" "kumuliert.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -652,7 +654,7 @@ msgstr "" " -D, --directory=VERZ VERZ der Liste der Eingabedateien hinzufügen\n" "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -665,7 +667,7 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "»-« angegeben ist.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -685,8 +687,8 @@ msgstr "" " -u, --unique Abkürzung für »--less-than=2«; Meldungen\n" " anfordern, die nur einmal vorkommen\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -700,6 +702,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -722,7 +726,7 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erzeugen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -733,15 +737,15 @@ msgstr "" " -h, --help diese Hilfe anzeigen und beenden\n" " -V, --version Versionsnummer anzeigen und beenden\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "keine Eingabedateien angegeben" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "es werden genau zwei Eingabedateien benötigt" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n" @@ -780,7 +784,7 @@ msgstr "" " -D, --directory=VERZEICHNIS VERZEICHNIS der Liste hinzufügen, in dem nach\n" " Eingabedateien gesucht werden soll\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -789,15 +793,15 @@ msgstr "" "Optionen, die Verarbeitungen modifizieren:\n" " -m, --multi-domain Ref.pot auf jeden Bereich in Def.po anwenden\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "diese Meldung kommt vor, ist aber nicht definiert..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...diese Definition ist ähnlich" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert" @@ -821,11 +825,11 @@ msgstr "Mehrfachdefinition der Meldung" msgid "...this is the location of the first definition" msgstr "...dies ist die Stelle der ersten Definition" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "es müssen mindestens zwei Dateien angegeben werden" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -847,7 +851,7 @@ msgstr "" "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n" "kumuliert.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -867,8 +871,8 @@ msgstr "" " -u, --unique Abkürzung für »--less-than=2«; Meldungen\n" " anfordern, die nur einmal vorkommen\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -879,6 +883,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -899,14 +905,14 @@ msgstr "" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" " --omit-header »msgid \"\"«-Eintrag im Kopfteil nicht erzeugen\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" "Einen Katalog mit Übersetzungen in eine andere Zeichensatz-Kodierung\n" "konvertieren.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -917,8 +923,8 @@ msgstr "" " -t, --to-code=NAME Kodierung für die Ausgabe\n" "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -929,6 +935,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -947,20 +955,20 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erzeugen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "Eingabedatei fehlt" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "es wird genau eine Eingabedatei benötigt" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Aufruf: %s [OPTION] EINGABEDATEI\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -973,7 +981,7 @@ msgstr "" "i. A. von xgettext erzeugt). Unübersetzte Einträge bekommen eine Übersetzung\n" "zugewiesen, die mit der msgid identisch ist, und werden als »fuzzy« markiert.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -1021,7 +1029,7 @@ msgstr "" "einem Nullbyte-Zeichen. Dei Ausgabe von »msgexec 0« ist geeignet als Eingabe für\n" "»xargs -0«.\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -1039,30 +1047,30 @@ msgstr "" msgid "write to stdout failed" msgstr "Schreiben nach Standardausgabe fehlgeschlagen" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "Schreiben zum Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "Name des Filters fehlt" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "es muss mindestens ein sed-Skript angegeben werden" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen anwenden.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1072,7 +1080,7 @@ msgstr "" "Standardeingabe liest und die geänderte Übersetzung nach der Standardausgabe\n" "schreibt.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1087,8 +1095,8 @@ msgstr "" " Befehlen hinzufügen\n" " -n, --quiet, --silent \"Pattern-Space\" nicht automatisch ausgeben\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1100,6 +1108,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1118,24 +1128,24 @@ msgstr "" " -s, --sort-output sortierte Ausgabe erzeugen\n" " -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "es ist nicht möglich, eine nicht-blockierende Ein/Ausgabe zum Subprozess %s\n" "zu setzen" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "Lesen vorm Subprozess %s fehlgeschlagen" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "Subprozess %s wurde mit dem Exitcode %d beendet" @@ -1145,18 +1155,18 @@ msgstr "Subprozess %s wurde mit dem Exitcode %d beendet" 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s erfordert eine Angabe in der Art »-l Lokale«" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s ist nur mit %s gültig" @@ -1525,13 +1535,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:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "Option »%c« kann nicht verwendet werden, bevor »K« or »T« festgelegt ist" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1542,7 +1552,7 @@ msgstr "" # To avoid confusion, let msgid and msgstr untranslated here! # 2001-11-04 11:16:55 CET -ke- -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1607,8 +1617,8 @@ msgstr "" " -f, --file=FILE MUSTER der DATEI entnehmen\n" " -i, --ignore-case Groß-/Kleinschreibung nicht unterscheiden\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1619,6 +1629,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1637,11 +1649,11 @@ msgstr "" " --sort-output sortierte Ausgabe erzeugen\n" " --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "Schreiben zum Subprozess grep fehlgeschlagen" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1652,7 +1664,7 @@ msgstr "" "beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen " "können.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1663,12 +1675,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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "%s wurde erzeugt.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1677,7 +1689,7 @@ msgstr "" "Neue Po-Datei erzeugen und die Meta-Informationen mit Werten der Umgebung des\n" "Benutzers initialisieren.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1691,7 +1703,7 @@ msgstr "" "POT-Datei gesucht. Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1705,20 +1717,22 @@ msgstr "" "»--locale« oder von den Lokale-Einstellungen des Benutzers ab.\n" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben ist.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Details zur Ausgabe:\n" " -l, --locale=LL_CC Lokale für die Ausgabe setzen\n" " --no-translator automatische Erzeugung der PO-Datei annehmen\n" " -w, --width=ANZAHL Breite der Ausgabe auf ANZAHL Spalten festlegen\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1726,11 +1740,11 @@ 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:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "Fehler beim Lesen des aktuellen Verzeichnisses" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1738,23 +1752,23 @@ 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() fehlgeschlagen" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "Subprozess %s mit Ein-/Ausgabefehler" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "Subprozess %s mit dem Exitcode %d fehlgeschlagen" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1771,7 +1785,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "German messages for %s" @@ -1808,7 +1822,7 @@ 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:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "Warnung: " @@ -1914,11 +1928,11 @@ msgstr "" "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n" "%s hängt von iconv() ab. Diese Version wurde ohne iconv() erzeugt." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "Art der Sicherung" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1942,7 +1956,7 @@ msgstr "" "exakte Übereinstimmung bei Meldungen gibt, wird mittels inexakter Suche\n" "versucht, ein besseres Ergebnis zu erzielen.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1960,7 +1974,7 @@ msgstr "" " -C, --compendium=DATEI zusätzliche Bibliothek mit Übersetzungen, es\n" " können mehrere angegeben werden\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1971,7 +1985,7 @@ msgstr "" " -U, --update Def.po aktualisieren; nichts unternehmen,\n" " wenn Def.po bereits aktuell ist\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -2004,7 +2018,7 @@ msgstr "" "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n" "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -2019,15 +2033,15 @@ msgstr "" " -v, --verbose mehr Hinweise während der Verarbeitung geben\n" " -q, --quiet, --silent Fortschrittsanzeige unterdrücken\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "diese Meldung sollte Pluralformen definieren" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "diese Meldung sollte keine Pluralformen definieren" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2036,28 +2050,28 @@ msgstr "" "%s%ld alte + %ld Referenzeinträge gelesen,\n" "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " fertig.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s und explizite Angabe des Dateinamens schließen sich gegenseitig aus" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Aufruf: %s [OPTION] [DATEI]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" "Binären Katalog mit Meldungen in eine .po-Datei gemäß Uniforum-Format\n" "umwandeln.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -2069,7 +2083,7 @@ msgstr "" " für Java erzeugen\n" " --tcl Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-Datei\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -2082,7 +2096,7 @@ msgstr "" "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n" "gelesen.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -2099,7 +2113,7 @@ msgstr "" "der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«). Die Option\n" "»-d« ist notwendig. Die Klasse mittels CLASSPATH gesucht.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2116,7 +2130,7 @@ msgstr "" "Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei ist im angegebenen\n" "Verzeichnis zu finden.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2129,8 +2143,8 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "»-« angegeben ist.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2139,6 +2153,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Details zur Ausgabe:\n" @@ -2152,7 +2168,7 @@ msgstr "" " -w, --width=ANZAHL Breite der Ausgabe auf ANZAHL Spalten festlegen\n" " -s, --sort-output sortierte Ausgabe erzeugen\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2165,7 +2181,7 @@ msgstr "" " -V, --version Versionsnummer anzeigen und beenden\n" " -v, --verbose mehr Hinweise während der Verarbeitung geben\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2188,7 +2204,7 @@ msgstr "" "Stellenangaben der Meldungen in den Quellen werden kumuliert. Bei Verwendung\n" "der Option --unique werden doppelte Einträge verworfen.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2351,7 +2367,7 @@ msgstr "Pluralform hat einen falschen Index" msgid "too many errors, aborting" msgstr "zu viele Fehler: Abbruch" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "ungültige Multibyte-Sequenz" @@ -2457,7 +2473,7 @@ msgstr "kein gültiger Name einer Java-Klasse: %s" msgid "failed to create \"%s\"" msgstr "Fehler beim Anlegen »%s«" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "Fehler beim Schreiben von Datei »%s«" @@ -2473,14 +2489,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "Fehler beim Öffnen von »%s« zum Schreiben" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2496,12 +2512,12 @@ msgstr "" "msgid mit reinen ASCII-Zeichen aus.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "Ausgabedatei »%s« kann nicht erzeugt werden" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "Standardausgabe" @@ -2516,7 +2532,7 @@ msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt beendet" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "diese Datei darf keine »domain«-Anweisung enthalten" @@ -2535,29 +2551,29 @@ msgstr "%s:%d: Zahl nach # fehlt" msgid "%s:%d: invalid string expression" msgstr "%s:%d: ungültiger Audruck einer Zeichenkette" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 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:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2566,7 +2582,7 @@ msgstr "" "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n" "notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2582,7 +2598,7 @@ msgstr "" "Ergebnisse werden nach der Standardausgabe geschrieben, wenn keine Datei oder\n" "»-« angegeben ist.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2602,7 +2618,7 @@ msgstr "" "Gemäß Vorgabe wird die Sprache anhand des Suffixes des Namens der Eingabedatei\n" "geraten.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2617,7 +2633,7 @@ msgstr "" " -c, --add-comments[=KENNUNG] Kommentare mit KENNUNG (oder die aus Zeilen\n" " vor einem Schlüsselwort) herausschreiben\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2637,8 +2653,8 @@ msgstr "" " --debug detaillierteres Ergebnis bei Erkennung der\n" " Formatelemente\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2649,6 +2665,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2678,11 +2696,11 @@ msgstr "" " -m, --msgstr-prefix[=KETTE] KETTE oder \"\" als Präfix für msgstr nehmen\n" " -M, --msgstr-suffix[=KETTE] KETTE oder \"\" als Suffix für msgstr nehmen\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "Standardeingabe" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2692,7 +2710,7 @@ msgstr "" "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n" "zurück, keine leere Zeichenkette.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "Programmiersprache »%s« unbekannt" diff --git a/po/el.gmo b/po/el.gmo index 5c1e24ed4..f1a3a2265 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 4c768dc4d..89bd61fd3 100644 --- a/po/el.po +++ b/po/el.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.34\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 1998-05-17 13:12+0200\n" "Last-Translator: Simos KSenitellis \n" "Language-Team: Greek \n" @@ -30,7 +30,7 @@ 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç" @@ -273,11 +273,11 @@ msgid "" msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò" # -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -290,17 +290,17 @@ msgstr "" "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n" # -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n" # -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "ðÜñá ðïëëÜ ïñßóìáôá" @@ -310,11 +310,11 @@ msgid "missing arguments" msgstr "õðïëåßðïíôáé ïñßóìáôá" # -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n" @@ -378,16 +378,16 @@ msgstr "" "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n" # -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -407,9 +407,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -421,44 +421,44 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" # -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -467,8 +467,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -477,7 +477,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -489,7 +489,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -502,7 +502,7 @@ msgid "" msgstr "" # -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -514,6 +514,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -538,18 +540,18 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" # -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -579,7 +581,7 @@ msgstr "" "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n" "èá äéáôçñçèïýí.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -589,7 +591,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -599,7 +601,7 @@ msgid "" msgstr "" # -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -629,7 +631,7 @@ msgstr "" "èá äéáôçñçèïýí.\n" # -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -644,6 +646,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -667,7 +671,7 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -676,16 +680,16 @@ msgid "" msgstr "" # -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ" # -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -726,7 +730,7 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -734,17 +738,17 @@ msgid "" msgstr "" # -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..." # -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò" # -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" @@ -772,12 +776,12 @@ msgid "...this is the location of the first definition" msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý" # -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá" # -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -807,7 +811,7 @@ msgstr "" "èá äéáôçñçèïýí.\n" # -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -837,7 +841,7 @@ msgstr "" "èá äéáôçñçèïýí.\n" # -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -849,6 +853,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -873,12 +879,12 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -887,7 +893,7 @@ msgid "" msgstr "" # -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -899,6 +905,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -923,22 +931,22 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ" # -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -947,7 +955,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -984,7 +992,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -997,41 +1005,41 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" # -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "õðïëåßðïíôáé ïñßóìáôá" # -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1042,7 +1050,7 @@ msgid "" msgstr "" # -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1055,6 +1063,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1078,22 +1088,22 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1103,18 +1113,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1454,19 +1464,19 @@ msgid "%s: warning: source file contains fuzzy translation" msgstr "" "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1498,7 +1508,7 @@ msgid "" msgstr "" # -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1510,6 +1520,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1533,18 +1545,18 @@ msgstr "" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1552,19 +1564,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1573,7 +1585,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1582,48 +1594,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1635,7 +1649,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1669,7 +1683,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1749,12 +1763,12 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" # -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1780,7 +1794,7 @@ msgstr "" "Ôá áðïôåëÝóìáôá ãñÜöïíôáé óôçí êáíïíéêÞ Ýîïäï åêôüò êáé áí ïñßæåôáé\n" "êÜðïéï áñ÷åßï åîüäïõ.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1791,7 +1805,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1799,7 +1813,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1816,7 +1830,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1827,19 +1841,19 @@ msgid "" msgstr "" # -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s" # -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1849,27 +1863,27 @@ msgstr "" "Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n" # -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " Ýãéíå.\n" # -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1877,7 +1891,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1885,7 +1899,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1895,7 +1909,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1905,7 +1919,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1915,7 +1929,7 @@ msgid "" msgstr "" # -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1925,6 +1939,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "×ñÞóç: %s [ÅÐÉËÏÃÇ] filename.mo filename.po\n" @@ -1936,7 +1952,7 @@ msgstr "" " -S, --strict ìïñöÞ åîüäïõ ôï áõóôçñü Uniforum\n" " -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1945,7 +1961,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1958,7 +1974,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2118,7 +2134,7 @@ msgid "too many errors, aborting" msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù" # -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 #, fuzzy msgid "invalid multibyte sequence" msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò" @@ -2238,7 +2254,7 @@ msgid "failed to create \"%s\"" msgstr "" # -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\"" @@ -2254,7 +2270,7 @@ msgid "error while opening \"%s\" for writing" msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ" # -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2262,7 +2278,7 @@ msgstr "" "ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%" "c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2272,13 +2288,13 @@ msgid "" msgstr "" # -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\"" # -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "êáíïíéêÞ Ýîïäïò" @@ -2296,7 +2312,7 @@ msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü" # -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ" @@ -2316,36 +2332,36 @@ msgid "%s:%d: invalid string expression" msgstr "" # -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí " "êáíïíéêÞ Ýîïäï" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" # -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2355,7 +2371,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2367,7 +2383,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2377,7 +2393,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2389,7 +2405,7 @@ msgid "" msgstr "" # -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2401,6 +2417,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2430,11 +2448,11 @@ msgstr "" " -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n" # -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "êáíïíéêÞ åßóïäïò" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2442,7 +2460,7 @@ msgid "" msgstr "" # -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo index 19bdf3d92..f2c896100 100644 Binary files a/po/en@boldquot.gmo and b/po/en@boldquot.gmo differ diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 633da0fb4..847f75f8b 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -31,8 +31,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" -"PO-Revision-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" +"PO-Revision-Date: 2002-04-24 19:27+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgid "Valid arguments are:" msgstr "Valid arguments are:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error while opening “%s” for reading" @@ -281,11 +281,11 @@ msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s" "[0m’ are not the same" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -296,16 +296,16 @@ msgstr "" "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" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "too many arguments" @@ -313,11 +313,11 @@ msgstr "too many arguments" msgid "missing arguments" msgstr "missing arguments" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" @@ -378,15 +378,15 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" @@ -411,9 +411,9 @@ msgstr "" " and aliases\n" " -i, --ip-address addresses for the hostname\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -428,28 +428,28 @@ msgstr "" msgid "could not get host name" msgstr "could not get host name" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "at most one input file allowed" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s and %s are mutually exclusive" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [INPUTFILE]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -458,15 +458,15 @@ msgstr "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap 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:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -479,8 +479,8 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -493,7 +493,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -512,7 +512,7 @@ msgstr "" " --no-obsolete remove obsolete #~ messages\n" " --only-obsolete keep obsolete #~ messages\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -531,7 +531,7 @@ msgstr "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" " --obsolete synonym for --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, no-wrap msgid "" "Output details:\n" @@ -543,6 +543,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -555,20 +557,22 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "impossible selection criteria specified (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [INPUTFILE]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -591,7 +595,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -606,7 +610,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -619,7 +623,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -640,7 +644,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, no-wrap msgid "" "Output details:\n" @@ -655,6 +659,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -670,10 +676,12 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -684,15 +692,15 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "no input files given" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "exactly 2 input files required" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" @@ -727,7 +735,7 @@ msgstr "" " ref.pot references to the sources\n" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -736,15 +744,15 @@ msgstr "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "this message is used but not defined..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...but this definition is similar" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "this message is used but not defined in %s" @@ -768,11 +776,11 @@ msgstr "duplicate message definition" msgid "...this is the location of the first definition" msgstr "...this is the location of the first definition" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "at least two files must be specified" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -793,7 +801,7 @@ msgstr "" "PO file to define them. File positions from all PO files will be\n" "cumulated.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -814,7 +822,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, no-wrap msgid "" "Output details:\n" @@ -826,6 +834,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -839,16 +849,18 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with ‘msgid \"\"’ entry\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap 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:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -859,7 +871,7 @@ msgstr "" " -t, --to-code=NAME encoding for output\n" "The default encoding is the current locale's encoding.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, no-wrap msgid "" "Output details:\n" @@ -871,6 +883,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -883,23 +897,25 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "no input file given" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "exactly one input file required" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Usage: %s [OPTION] INPUTFILE\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -912,7 +928,7 @@ msgstr "" "xgettext). Untranslated entries are assigned a translation that is\n" "identical to the msgid, and are marked fuzzy.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -958,7 +974,7 @@ 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:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -975,30 +991,30 @@ msgstr "" msgid "write to stdout failed" msgstr "write to stdout failed" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "write to %s subprocess failed" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "missing filter name" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "at least one sed script must be specified" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap 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:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1007,7 +1023,7 @@ 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1022,7 +1038,7 @@ msgstr "" " to be executed\n" " -n, --quiet, --silent suppress automatic printing of pattern space\n" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, no-wrap msgid "" "Output details:\n" @@ -1035,6 +1051,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1048,25 +1066,27 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, 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:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "communication with %s subprocess failed" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "read from %s subprocess failed" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s subprocess terminated with exit code %d" @@ -1076,18 +1096,18 @@ msgstr "%s subprocess terminated with exit code %d" 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requires a “-d directory” specification" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requires a “-l locale” specification" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s is only valid with %s" @@ -1449,14 +1469,14 @@ msgstr "fuzzy ‘msgstr’ entry ignored" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: warning: source file contains fuzzy translation" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "option ‘%c’ cannot be used before ‘K’ or ‘T’ has been " "specified" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1465,7 +1485,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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1522,7 +1542,7 @@ msgstr "" " -f, --file=FILE obtain PATTERN from FILE\n" " -i, --ignore-case ignore case distinctions\n" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, no-wrap msgid "" "Output details:\n" @@ -1534,6 +1554,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1546,14 +1568,16 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "write to grep subprocess failed" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1563,7 +1587,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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1574,12 +1598,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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Created %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1588,7 +1612,7 @@ msgstr "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1601,7 +1625,7 @@ msgstr "" "If no input file is given, the current directory is searched for the POT file.\n" "If it is -, standard input is read.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1614,20 +1638,24 @@ 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:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1635,11 +1663,11 @@ msgstr "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "error reading current directory" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1647,23 +1675,23 @@ msgstr "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() failed" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s subprocess I/O error" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s subprocess failed with exit code %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1680,7 +1708,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "English translations for %s package" @@ -1718,7 +1746,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "target charset “%s” is not a portable encoding name." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "warning: " @@ -1822,11 +1850,11 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(). This " "version was built without iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "backup type" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1849,7 +1877,7 @@ msgstr "" "comments and file positions will be preserved. Where an exact match\n" "cannot be found, fuzzy matching is used to produce better results.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1866,7 +1894,7 @@ msgstr "" " -C, --compendium=FILE additional library of message translations,\n" " may be specified more than once\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1877,7 +1905,7 @@ msgstr "" " -U, --update update def.po,\n" " do nothing if def.po already up to date\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1906,7 +1934,7 @@ msgstr "" "The backup suffix is ‘~’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1921,15 +1949,15 @@ msgstr "" " -v, --verbose increase verbosity level\n" " -q, --quiet, --silent suppress progress indicators\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "this message should define plural forms" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "this message should not define plural forms" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1938,26 +1966,26 @@ msgstr "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s and explicit file names are mutually exclusive" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Usage: %s [OPTION] [FILE]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap 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:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1968,7 +1996,7 @@ msgstr "" " -j, --java Java mode: input is a Java ResourceBundle class\n" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1979,7 +2007,7 @@ msgstr "" " FILE ... input .mo files\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1994,7 +2022,7 @@ msgstr "" "The class name is determined by appending the locale name to the resource name,\n" "separated with an underscore. The class is located using the CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2009,7 +2037,7 @@ msgstr "" "The -l and -d options are mandatory. The .msg file is located in the\n" "specified directory.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2022,7 +2050,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, no-wrap msgid "" "Output details:\n" @@ -2032,6 +2060,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Output details:\n" @@ -2041,9 +2071,11 @@ msgstr "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2056,7 +2088,7 @@ msgstr "" " -V, --version output version information and exit\n" " -v, --verbose increase verbosity level\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2077,7 +2109,7 @@ 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:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2233,7 +2265,7 @@ msgstr "plural form has wrong index" msgid "too many errors, aborting" msgstr "too many errors, aborting" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "invalid multibyte sequence" @@ -2334,7 +2366,7 @@ msgstr "not a valid Java class name: %s" msgid "failed to create \"%s\"" msgstr "failed to create “%s”" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "error while writing “%s” file" @@ -2348,7 +2380,7 @@ msgstr "compilation of Java class failed, please try --verbose or set $JAVAC" msgid "error while opening \"%s\" for writing" msgstr "error while opening “%s” for writing" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2356,7 +2388,7 @@ msgstr "" "internationalized messages should not contain the ‘\\%c’ escape " "sequence" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2369,12 +2401,12 @@ msgstr "" "different from yours. Consider using a pure ASCII msgid instead.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "cannot create output file “%s”" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard output" @@ -2389,7 +2421,7 @@ msgstr "%s:%d: warning: unterminated character constant" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: warning: unterminated string literal" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "this file may not contain domain directives" @@ -2408,25 +2440,25 @@ msgstr "%s:%d: missing number after #" msgid "%s:%d: invalid string expression" msgstr "%s:%d: invalid string expression" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext cannot work without keywords to look for" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extract translatable strings from given input files.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2435,7 +2467,7 @@ msgstr "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2450,7 +2482,7 @@ msgstr "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" "If output file is -, output is written to standard output.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2469,7 +2501,7 @@ msgstr "" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2484,7 +2516,7 @@ msgstr "" " -c, --add-comments[=TAG] place comment block with TAG (or those\n" " preceding keyword lines) in output file\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2501,7 +2533,7 @@ msgstr "" " -T, --trigraphs understand ANSI C trigraphs for input\n" " --debug more detailed formatstring recognition result\n" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, no-wrap msgid "" "Output details:\n" @@ -2513,6 +2545,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2530,6 +2564,8 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with ‘msgid \"\"’ entry\n" @@ -2538,11 +2574,11 @@ msgstr "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2552,7 +2588,7 @@ msgstr "" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "language ‘%s’ unknown" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index 8acc78a30..176230ecf 100644 Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ diff --git a/po/en@quot.po b/po/en@quot.po index ee7fa1bca..900f5559f 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" -"PO-Revision-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" +"PO-Revision-Date: 2002-04-24 19:27+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgid "Valid arguments are:" msgstr "Valid arguments are:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error while opening “%s” for reading" @@ -268,11 +268,11 @@ msgid "" msgstr "" "format specifications in ‘msgid’ and ‘%s’ for argument ‘%s’ are not the same" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -283,16 +283,16 @@ msgstr "" "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" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Written by %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "too many arguments" @@ -300,11 +300,11 @@ msgstr "too many arguments" msgid "missing arguments" msgstr "missing arguments" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" @@ -365,15 +365,15 @@ msgstr "" "found in the selected catalog are translated.\n" "Standard search directory: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Report bugs to .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" @@ -398,9 +398,9 @@ msgstr "" " and aliases\n" " -i, --ip-address addresses for the hostname\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -415,28 +415,28 @@ msgstr "" msgid "could not get host name" msgstr "could not get host name" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "at most one input file allowed" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s and %s are mutually exclusive" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [INPUTFILE]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -445,15 +445,15 @@ msgstr "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap 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:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -466,8 +466,8 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -480,7 +480,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -499,7 +499,7 @@ msgstr "" " --no-obsolete remove obsolete #~ messages\n" " --only-obsolete keep obsolete #~ messages\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -518,7 +518,7 @@ msgstr "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" " --obsolete synonym for --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, no-wrap msgid "" "Output details:\n" @@ -530,6 +530,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -542,20 +544,22 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "impossible selection criteria specified (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [INPUTFILE]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -578,7 +582,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -593,7 +597,7 @@ msgstr "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" "If input file is -, standard input is read.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -606,7 +610,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -627,7 +631,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, no-wrap msgid "" "Output details:\n" @@ -642,6 +646,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -657,10 +663,12 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -671,15 +679,15 @@ msgstr "" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "no input files given" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "exactly 2 input files required" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" @@ -714,7 +722,7 @@ msgstr "" " ref.pot references to the sources\n" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -723,15 +731,15 @@ msgstr "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "this message is used but not defined..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...but this definition is similar" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "this message is used but not defined in %s" @@ -755,11 +763,11 @@ msgstr "duplicate message definition" msgid "...this is the location of the first definition" msgstr "...this is the location of the first definition" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "at least two files must be specified" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -780,7 +788,7 @@ msgstr "" "PO file to define them. File positions from all PO files will be\n" "cumulated.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -801,7 +809,7 @@ msgstr "" " -u, --unique shorthand for --less-than=2, requests\n" " that only unique messages be printed\n" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, no-wrap msgid "" "Output details:\n" @@ -813,6 +821,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -826,16 +836,18 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with ‘msgid \"\"’ entry\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap 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:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -846,7 +858,7 @@ msgstr "" " -t, --to-code=NAME encoding for output\n" "The default encoding is the current locale's encoding.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, no-wrap msgid "" "Output details:\n" @@ -858,6 +870,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -870,23 +884,25 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "no input file given" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "exactly one input file required" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Usage: %s [OPTION] INPUTFILE\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -899,7 +915,7 @@ msgstr "" "xgettext). Untranslated entries are assigned a translation that is\n" "identical to the msgid, and are marked fuzzy.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -945,7 +961,7 @@ 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:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -962,30 +978,30 @@ msgstr "" msgid "write to stdout failed" msgstr "write to stdout failed" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "write to %s subprocess failed" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "missing filter name" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "at least one sed script must be specified" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap 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:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -994,7 +1010,7 @@ 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1009,7 +1025,7 @@ msgstr "" " to be executed\n" " -n, --quiet, --silent suppress automatic printing of pattern space\n" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, no-wrap msgid "" "Output details:\n" @@ -1022,6 +1038,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1035,25 +1053,27 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, 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:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "communication with %s subprocess failed" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "read from %s subprocess failed" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s subprocess terminated with exit code %d" @@ -1063,18 +1083,18 @@ msgstr "%s subprocess terminated with exit code %d" 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requires a “-d directory” specification" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requires a “-l locale” specification" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s is only valid with %s" @@ -1427,12 +1447,12 @@ msgstr "fuzzy ‘msgstr’ entry ignored" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: warning: source file contains fuzzy translation" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "option ‘%c’ cannot be used before ‘K’ or ‘T’ has been specified" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1441,7 +1461,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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1498,7 +1518,7 @@ msgstr "" " -f, --file=FILE obtain PATTERN from FILE\n" " -i, --ignore-case ignore case distinctions\n" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, no-wrap msgid "" "Output details:\n" @@ -1510,6 +1530,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1522,14 +1544,16 @@ msgstr "" " --add-location preserve ‘#: filename:line’ lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "write to grep subprocess failed" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1539,7 +1563,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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1550,12 +1574,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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Created %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1564,7 +1588,7 @@ msgstr "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1577,7 +1601,7 @@ msgstr "" "If no input file is given, the current directory is searched for the POT file.\n" "If it is -, standard input is read.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1590,20 +1614,24 @@ 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:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1611,11 +1639,11 @@ msgstr "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "error reading current directory" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1623,23 +1651,23 @@ msgstr "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() failed" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s subprocess I/O error" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s subprocess failed with exit code %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1656,7 +1684,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "English translations for %s package" @@ -1693,7 +1721,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "target charset “%s” is not a portable encoding name." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "warning: " @@ -1797,11 +1825,11 @@ msgstr "" "Cannot convert from “%s” to “%s”. %s relies on iconv(). This version was " "built without iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "backup type" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1824,7 +1852,7 @@ msgstr "" "comments and file positions will be preserved. Where an exact match\n" "cannot be found, fuzzy matching is used to produce better results.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1841,7 +1869,7 @@ msgstr "" " -C, --compendium=FILE additional library of message translations,\n" " may be specified more than once\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1852,7 +1880,7 @@ msgstr "" " -U, --update update def.po,\n" " do nothing if def.po already up to date\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1881,7 +1909,7 @@ msgstr "" "The backup suffix is ‘~’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1896,15 +1924,15 @@ msgstr "" " -v, --verbose increase verbosity level\n" " -q, --quiet, --silent suppress progress indicators\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "this message should define plural forms" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "this message should not define plural forms" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1913,26 +1941,26 @@ msgstr "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " "obsolete %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s and explicit file names are mutually exclusive" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Usage: %s [OPTION] [FILE]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap 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:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1943,7 +1971,7 @@ msgstr "" " -j, --java Java mode: input is a Java ResourceBundle class\n" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1954,7 +1982,7 @@ msgstr "" " FILE ... input .mo files\n" "If no input file is given or if it is -, standard input is read.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1969,7 +1997,7 @@ msgstr "" "The class name is determined by appending the locale name to the resource name,\n" "separated with an underscore. The class is located using the CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1984,7 +2012,7 @@ msgstr "" "The -l and -d options are mandatory. The .msg file is located in the\n" "specified directory.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1997,7 +2025,7 @@ msgstr "" "The results are written to standard output if no output file is specified\n" "or if it is -.\n" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, no-wrap msgid "" "Output details:\n" @@ -2007,6 +2035,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Output details:\n" @@ -2016,9 +2046,11 @@ msgstr "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2031,7 +2063,7 @@ msgstr "" " -V, --version output version information and exit\n" " -v, --verbose increase verbosity level\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2052,7 +2084,7 @@ 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:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2208,7 +2240,7 @@ msgstr "plural form has wrong index" msgid "too many errors, aborting" msgstr "too many errors, aborting" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "invalid multibyte sequence" @@ -2309,7 +2341,7 @@ msgstr "not a valid Java class name: %s" msgid "failed to create \"%s\"" msgstr "failed to create “%s”" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "error while writing “%s” file" @@ -2323,14 +2355,14 @@ msgstr "compilation of Java class failed, please try --verbose or set $JAVAC" msgid "error while opening \"%s\" for writing" msgstr "error while opening “%s” for writing" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2343,12 +2375,12 @@ msgstr "" "different from yours. Consider using a pure ASCII msgid instead.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "cannot create output file “%s”" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard output" @@ -2363,7 +2395,7 @@ msgstr "%s:%d: warning: unterminated character constant" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: warning: unterminated string literal" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "this file may not contain domain directives" @@ -2382,25 +2414,25 @@ msgstr "%s:%d: missing number after #" msgid "%s:%d: invalid string expression" msgstr "%s:%d: invalid string expression" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext cannot work without keywords to look for" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extract translatable strings from given input files.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2409,7 +2441,7 @@ msgstr "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2424,7 +2456,7 @@ msgstr "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" "If output file is -, output is written to standard output.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2443,7 +2475,7 @@ msgstr "" " -C, --c++ shorthand for --language=C++\n" "By default the language is guessed depending on the input file name extension.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2458,7 +2490,7 @@ msgstr "" " -c, --add-comments[=TAG] place comment block with TAG (or those\n" " preceding keyword lines) in output file\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2475,7 +2507,7 @@ msgstr "" " -T, --trigraphs understand ANSI C trigraphs for input\n" " --debug more detailed formatstring recognition result\n" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, no-wrap msgid "" "Output details:\n" @@ -2487,6 +2519,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2504,6 +2538,8 @@ msgstr "" " -n, --add-location generate ‘#: filename:line’ lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with ‘msgid \"\"’ entry\n" @@ -2512,11 +2548,11 @@ msgstr "" " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n" " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2526,7 +2562,7 @@ msgstr "" "gettext(\"\") returns the header entry with\n" "meta information, not the empty string.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "language ‘%s’ unknown" diff --git a/po/es.gmo b/po/es.gmo index ad73857e0..69bfd9b60 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 3f2fb1e09..2b96836e8 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11-pre3\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-12-24 11:21-0500\n" "Last-Translator: Max de Mendizábal \n" "Language-Team: Spanish \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" msgstr "Los argumentos válidos son:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "error al abrir el fichero \"%s\" para lectura" @@ -259,11 +259,11 @@ msgstr "" "las especificaciones de formato en 'msgid' y 'msgstr' para el argumento '%s' " "no son las mismas" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -275,16 +275,16 @@ msgstr "" "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" "FIN DETERMINADO.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "demasiados argumentos" @@ -292,11 +292,11 @@ msgstr "demasiados argumentos" msgid "missing arguments" msgstr "faltan argumentos" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" @@ -374,15 +374,15 @@ msgstr "" "encuentre dentro del catálogo seleccionado.\n" "Directorio de búsqueda estándar: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Comunicar los `bugs' a .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN]\n" @@ -407,9 +407,9 @@ msgstr "" " completo del dominio calificado,\n" " -i, --ip-address dirección del nombre de la máquina\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -424,28 +424,28 @@ msgstr "" msgid "could not get host name" msgstr "no se pudo obtener el nombre de la máquina" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "sólo se permite un fichero de entrada máximo" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s y %s son mutuamente excluyentes" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -454,15 +454,15 @@ 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:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Los argumentos obligatorios para las opciones largas también son obligatorios para las opciones cortas.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -476,8 +476,8 @@ msgstr "" " de ficheros de entrada\n" "Si no se da ningún fichero de entrada o si es -, se lee la entrada estándar.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -490,7 +490,7 @@ 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:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -509,7 +509,7 @@ msgstr "" " --no-obsolete elimina los mensajes obsoletos #~\n" " --only-obsolete conserva los mensajes obsoletos #~\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -528,8 +528,8 @@ msgstr "" " --fuzzy sinónimo de --only-fuzzy --clear-fuzzy\n" " --obsolete sinónimo de --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -540,6 +540,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -557,17 +559,17 @@ msgstr "" " -s, --sort-output genera una salida ordenada\n" " -F, --sort-by-file ordena la salida por localización de ficheros\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, 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:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -593,7 +595,7 @@ msgstr "" "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n" "los ficheros PO se conservarán. \n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -610,7 +612,7 @@ msgstr "" " de ficheros de entrada\n" "Si el fichero de entrada es -, se lee la entrada estándar.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -623,7 +625,7 @@ msgstr "" "Los resultados se escriben a la salida estándar si no se especifica un \n" "fichero de salida o si es -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -649,8 +651,8 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -664,6 +666,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -683,7 +687,7 @@ msgstr "" " -s, --sort-output escribe la salida ordenada\n" " -F, --sort-by-file escribe la salida ordenada por fichero\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -694,15 +698,15 @@ msgstr "" " -h, --help muestra esta ayuda y finaliza\n" " -V, --version muestra la versión y finaliza\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "no se especificaron ficheros de entrada" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "se requieren exactamente 2 ficheros de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n" @@ -800,7 +804,7 @@ msgstr "" " -D, --directory=DIRECTORIO añade al DIRECTORIO a la lista de búsqueda\n" " de ficheros de entrada\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -810,15 +814,15 @@ msgstr "" " -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n" " def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "este mensaje se usa pero no está definido..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...pero esta definición es parecida" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "este mensaje se usa pero no está definido en %s" @@ -864,11 +868,11 @@ msgstr "definici msgid "...this is the location of the first definition" msgstr "...aquí está la primera definición" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "se deben especificar por lo menos dos ficheros" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -891,7 +895,7 @@ msgstr "" "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n" "conservarán.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -914,8 +918,8 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -926,6 +930,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -944,12 +950,12 @@ msgstr "" " -F, --sort-by-file escribe la salida ordenada por fichero\n" " --omit-header no escribe la línea de encabezado `msgid \"\"'\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap 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:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -963,8 +969,8 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -975,6 +981,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -992,20 +1000,20 @@ msgstr "" " -F, --sort-by-file escribe la salida ordenada por fichero\n" # acepto sugerencia de em pero agrego un "el". mm -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "no se especificó el fichero de entrada" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "se requieren exactamente un ficheros de entrada" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -1018,7 +1026,7 @@ msgstr "" "por xgettext). Las entradas no traducidas son asignadas a una traducción que\n" "es idéntica a la del msgid y son marcadas como difusas.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -1067,7 +1075,7 @@ 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:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -1085,30 +1093,30 @@ msgstr "" msgid "write to stdout failed" msgstr "fallo en la escritura a la salida estándar" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "fallo en la escritura la subproceso %s" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "falta el nombre del filtro" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "se debe especificar al menos un guión de sed" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap 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:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -1117,7 +1125,7 @@ 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1137,8 +1145,8 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1150,6 +1158,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1168,22 +1178,22 @@ msgstr "" " -s, --sort-output escribe la salida ordenada\n" " -F, --sort-by-file escribe la salida ordenada por fichero\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, 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:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "fallo en la comunicación con el subproceso %s" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "fallo en la lectura del subproceso %s" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "el subproceso %s terminó con un código de salida %d" @@ -1193,18 +1203,18 @@ msgstr "el subproceso %s termin 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requiere que se especifique un \"-d directorio\"" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, fuzzy, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requiere que se especifique un \"-d directorio\"" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s sólo es válido con %s" @@ -1633,14 +1643,14 @@ msgstr "se descarta la l msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: atención: el fichero fuente contiene una traducción difusa" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "la opción '%c' no se puede usar antes de que 'K' o 'T' hayan sido " "especificadas" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1649,7 +1659,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:434 +#: src/msggrep.c:439 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -1712,8 +1722,8 @@ msgstr "" # Lo mismo en ' informa de la versión...' em # Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende # es ser fiel al original, pon 'son tambien obligatorios para...' em+ -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1724,6 +1734,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1741,11 +1753,11 @@ msgstr "" " --sort-by-file escribe la salida ordenada por localización \n" " de fichero\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "fallo en la escritura al subproceso grep" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1755,7 +1767,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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1766,12 +1778,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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Creado %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1780,7 +1792,7 @@ msgstr "" "Crea un nuevo fichero PO, inicializando la metainformación con valores\n" "tomados del entorno del usuario.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1794,7 +1806,7 @@ msgstr "" "actual.\n" "Si es -, se lee la entrada estándar.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1808,13 +1820,15 @@ msgstr "" "de la selección local del usuario. Si es -, los resultados se escriben en\n" "la salida estándar.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Detalles de salida:\n" " -l, --locale=LL_CC ajusta el local destino\n" @@ -1822,7 +1836,7 @@ msgstr "" " automáticamente\n" " -w, --width=NÚMERO ajusta la anchura de la página de salida\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1831,11 +1845,11 @@ msgstr "" "Favor de especificar el fichero .pot de entrada utilizando la opción --" "input\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "error en la lectura del directorio actual" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1844,23 +1858,23 @@ msgstr "" "Favor de especificar el fichero .pot de entrada utilizando la opción --" "input\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fallo en fdopen()" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "error de E/S en el subproceso %s" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, 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:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1876,7 +1890,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Traducciones al español para el paquete %s" @@ -1920,7 +1934,7 @@ msgstr "" "portátil." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "atención: " @@ -2026,11 +2040,11 @@ msgstr "" "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n" "Esta versión fue construida sin iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "tipo de respaldo" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -2053,7 +2067,7 @@ msgstr "" "haya una coincidencia exacta, se utilizará el método de comparación difusa\n" "para obtener mejores resultados.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -2071,7 +2085,7 @@ msgstr "" " -C, --compendium=FICHERO biblioteca adicional de traducción de mensajes,\n" " puede ser especificada más de una vez\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -2082,7 +2096,7 @@ msgstr "" " -U, --update actualiza def.po,\n" " no hace nada si def.po ya está actualizado\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -2113,7 +2127,7 @@ msgstr "" "El sufijo de los respaldos es `~', a menos que se ponga la opción --suffix o\n" "la variable de entorno SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -2128,15 +2142,15 @@ msgstr "" " -v, --verbose incrementa el nivel de mensajes\n" " -q, --quiet, --silent suprime los indicadores de progreso\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "este mensaje debería definir las formas plurales" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "este mensaje no debería definir las formas plurales" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -2146,26 +2160,26 @@ msgstr "" "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n" # Porque no mejor poner simplemente 'fin'? mm++ -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " terminado.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, 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:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap 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:329 +#: src/msgunfmt.c:334 #, fuzzy, no-wrap msgid "" "Operation mode:\n" @@ -2178,7 +2192,7 @@ msgstr "" " --java2 como --java, y supone el uso de Java2\n" " (JDK 1.2 o superior)\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -2189,7 +2203,7 @@ msgstr "" " FICHERO ... ficheros de entrada .mo\n" "Si no se especifica un fichero de entrada o si es -, se lee la entrada estándar.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -2205,7 +2219,7 @@ msgstr "" "recurso, separado por un guión bajo. La clase se localiza utilizando la\n" "variable de entorno CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, fuzzy, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2222,7 +2236,7 @@ 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/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2235,8 +2249,8 @@ 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/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2245,6 +2259,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Detalles de salida:\n" @@ -2257,7 +2273,7 @@ msgstr "" " -w, --width=NÚMERO ajusta la anchura de la página de salida\n" " -s, --sort-output escribe la salida ordenada\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2271,7 +2287,7 @@ msgstr "" " -v, --verbose incrementa el nivel de mensajes\n" " -q, --quiet, --silent suprime los indicadores de progreso\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2294,7 +2310,7 @@ msgstr "" "ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n" "duplicados se descartan.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2503,7 +2519,7 @@ msgstr "la primera forma del plural tiene un msgid "too many errors, aborting" msgstr "demasiados errores, programa interrumpido" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "sucesión de multibyte inválida" @@ -2604,7 +2620,7 @@ msgstr "no es un nombre de clase Java v msgid "failed to create \"%s\"" msgstr "fallo al crear \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "hubo un error al escribir el fichero \"%s\"" @@ -2619,7 +2635,7 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "error al abrir el fichero \"%s\" para escritura" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2627,7 +2643,7 @@ msgstr "" "Los mensajes internacionalizados no deben contener la secuencia de escape `\\" "%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2640,12 +2656,12 @@ msgstr "" "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n" "en ASCII puro. %s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "no se puede crear el fichero de salida \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "salida estándar" @@ -2691,7 +2707,7 @@ msgstr "%s:%d: atenci # 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/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "este fichero no puede contener instrucciones de dominio" @@ -2710,29 +2726,29 @@ msgstr "%s:%d: falta un n msgid "%s:%d: invalid string expression" msgstr "%s:%d: expresión de cadena inválida" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext no puede funcionar sin palabras claves que buscar" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap 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:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2741,7 +2757,7 @@ 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/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2758,7 +2774,7 @@ msgstr "" " directorio DIR\n" "Si el fichero de salida es -, la salida será escrita a la salida estándar.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, fuzzy, no-wrap msgid "" "Choice of input file language:\n" @@ -2776,7 +2792,7 @@ msgstr "" "Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero\n" "de entrada.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2792,7 +2808,7 @@ msgstr "" " aquellas líneas que preceden a la palabra\n" " clave) en el fichero de salida\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2813,7 +2829,7 @@ msgstr "" " --debug muestra con más detalle el reconocimiento\n" " de las cadenas de formato\n" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2825,6 +2841,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2858,11 +2876,11 @@ msgstr "" " -M, --msgstr-suffix[=CADENA] utiliza la CADENA o \"\" como sufijo para las\n" " líneas del msgstr\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrada estándar" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2872,7 +2890,7 @@ msgstr "" "gettext(\"\") regresa la línea de encabezado con la\n" "metainformación, no una cadena vacía.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "lenguaje `%s' desconocido" diff --git a/po/et.gmo b/po/et.gmo index 2b1e0c411..2a7d80dbe 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 7839d0be9..3283185cd 100644 --- a/po/et.po +++ b/po/et.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-04-30 16:25+0200\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" @@ -28,7 +28,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "viga faili \"%s\" avamisel (lugemiseks)" @@ -233,11 +233,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,16 +250,16 @@ msgstr "" "TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n" "Litsentsi.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Selle programmi on kirjutanud %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "liiga palju argumente" @@ -267,11 +267,11 @@ msgstr "liiga palju argumente" msgid "missing arguments" msgstr "argumendid on puudu" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Täiendava info saamiseks proovi `%s --help'.\n" @@ -336,16 +336,16 @@ msgstr "" "found in the selected catalog are translated.!!!\n" "Standardne otsinukataloog: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Vigadest teata aadressile .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -365,9 +365,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -379,43 +379,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ja %s on vastastikku välistavad" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -424,8 +424,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -434,7 +434,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -446,7 +446,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -458,7 +458,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -470,6 +470,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -497,17 +499,17 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -535,7 +537,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -545,7 +547,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -554,7 +556,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -581,7 +583,7 @@ 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:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -596,6 +598,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -623,7 +627,7 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -631,15 +635,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "sisendfailid on määramata" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "vaja läheb täpselt kahte sisendfaili" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -679,22 +683,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "see teade on kasutusel, kuid kirjeldamata..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...kuid see kirjeldus on sarnane" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" @@ -718,11 +722,11 @@ msgstr "teade on kirjeldatud kaks korda" msgid "...this is the location of the first definition" msgstr "...see on esimese kirjelduse asukoht" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "vähemalt kaks faili peab olema ette antud" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -749,7 +753,7 @@ 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:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -776,7 +780,7 @@ 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:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -788,6 +792,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -816,12 +822,12 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -829,7 +835,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -841,6 +847,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -868,21 +876,21 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "sisendfail on määramata" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "vaja läheb täpselt kahte sisendfaili" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -891,7 +899,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -927,7 +935,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -940,39 +948,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "argumendid on puudu" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "vähemalt kaks faili peab olema ette antud" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -982,7 +990,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -995,6 +1003,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1022,22 +1032,22 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1047,18 +1057,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1374,19 +1384,19 @@ msgstr "ignoreerin kahtlast `msgstr' kirjet" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1417,7 +1427,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1429,6 +1439,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1456,18 +1468,18 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1475,19 +1487,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1496,7 +1508,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1505,48 +1517,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1558,7 +1572,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1592,7 +1606,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 #, fuzzy msgid "warning: " msgstr "%s: hoiatus: " @@ -1677,11 +1691,11 @@ msgstr "" "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n" "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1708,7 +1722,7 @@ msgstr "" "kahtlased. Kui väljundfaili ei ole kirjeldatud, saadetakse tulemus\n" "standardväljunisse.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1719,7 +1733,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1727,7 +1741,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1744,7 +1758,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1754,17 +1768,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1773,26 +1787,26 @@ msgstr "" "%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %" "ld, vananenuid %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " valmis.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ja %s on vastastikku välistavad" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1800,7 +1814,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1808,7 +1822,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1818,7 +1832,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1828,7 +1842,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1837,7 +1851,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1847,6 +1861,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Kasutamine: %s [VÕTI] [FAIL]...\n" @@ -1863,7 +1879,7 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1872,7 +1888,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1885,7 +1901,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2043,7 +2059,7 @@ msgstr "mitmuse vorm omab vale indeksit" msgid "too many errors, aborting" msgstr "liiga palju vigu, katkestan töö" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "vigane multibait jada" @@ -2146,7 +2162,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "viga faili \"%s\" kirjutamisel" @@ -2160,13 +2176,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "viga faili \"%s\" avamisel (kirjutamiseks)" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2175,12 +2191,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "ei suuda luua väljundfaili \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standardväljund" @@ -2195,7 +2211,7 @@ msgstr "%s:%d: l msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: hoiatus: lõpetamata string" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "see fail ei tohi sisaldada domeeni direktiive" @@ -2214,34 +2230,34 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2251,7 +2267,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2263,7 +2279,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2273,7 +2289,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2284,7 +2300,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2296,6 +2312,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2328,18 +2346,18 @@ msgstr "" " -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n" " -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standardsisend" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "tundmatu keel `%s'" diff --git a/po/fr.gmo b/po/fr.gmo index b53586b97..aa92b5b9a 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 710c8de1f..aa088610f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-17 20:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" msgstr "Les arguments valides sont:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erreur lors de l'ouverture de « %s » en lecture" @@ -259,11 +259,11 @@ msgstr "" "spécifications de format de « msgid » et de « %s » de l'argument « %s » ne " "sont pas les mêmes" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -275,16 +275,16 @@ msgstr "" "les permissions de copie. Il est distribué SANS AUCUNE GARANTIE\n" "de QUALITÉ LOYALE ET MARCHANDE ou d'ADÉQUATION POUR UN BUT PARTICULIER.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Écrit par %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "trop d'arguments" @@ -292,11 +292,11 @@ msgstr "trop d'arguments" msgid "missing arguments" msgstr "arguments manquants" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pour plus d'information, essayer « %s --help ».\n" @@ -357,15 +357,15 @@ msgstr "" "\n" "Répertoire standard de recherche: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Rapportez tout problème fonctionnel à .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Usage: %s [OPTION]\n" @@ -390,9 +390,9 @@ msgstr "" " et les aliases\n" " -i, --ip-address addresses IP de la machine hôte\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -407,28 +407,28 @@ msgstr "" msgid "could not get host name" msgstr "ne peut obtenir le nom de l'hôte" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "au plus un fichier d'entrée est permis" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s et %s s'excluent mutuellement" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -437,17 +437,17 @@ msgstr "" "Filtrer les messages d'un catalogue de traduction selon leurs attributs\n" "et manipuler leurs attributs.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Les arguments obligatoires pour la forme longue des options sont aussi\n" "obligatoires pour les formes courtes qui leur correspondent.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -460,8 +460,8 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -473,7 +473,7 @@ msgstr "" " -o, --output-file=FICHIER écrire la sortie dans le FICHIER spécifié\n" "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -493,7 +493,7 @@ msgstr "" " --no-obsolete enlever les messages obsolètes #~\n" " --only-obsolete conserver les messages obsolètes #~\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -512,8 +512,8 @@ msgstr "" " --fuzzy identique à --only-fuzzy --clear-fuzzy\n" " --obsolete identique à --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -524,6 +524,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -538,17 +540,17 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "Critère de sélection irréalisable (%d < N < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -570,7 +572,7 @@ msgstr "" "proviennent du premier fichier PO où elles ont été définies.\n" "Les positions de tous les fichiers PO seront cumulées.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -585,7 +587,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n" "Si le fichier d'entrée est -, lire de l'entrée standard.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -598,7 +600,7 @@ msgstr "" "Les résultats sont écrits sur la sortie standard si aucun fichier n'est\n" "spécifié ou si -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -617,8 +619,8 @@ msgstr "" " (sans limite par défaut i.e. = à zéro)\n" " -u, --unique identique à « -< 2 ou --less-than=2 »\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -632,6 +634,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -649,7 +653,7 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -660,15 +664,15 @@ msgstr "" " -h, --help fournir ce message d'aide, puis terminer\n" " -V, --version identifier le programme, puis terminer\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "aucun fichier en entrée" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "exactement deux fichiers sont requis en entrée" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Usage: %s [OPTION] def.po ref.pot\n" @@ -704,7 +708,7 @@ msgstr "" " ref.pot références aux sources\n" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -713,15 +717,15 @@ msgstr "" "Modificateurs d'opération:\n" " -m, --multi-domain appliquer ref.pot à chaque domaine défini dans def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "ce message, utilisé, n'est pas défini..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...mais cette définition lui est semblable" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "ce message, utilisé, n'est pas défini dans « %s »" @@ -745,11 +749,11 @@ msgstr "message doublement d msgid "...this is the location of the first definition" msgstr "...voici l'endroit de la première définition" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "Il faut indiquer au moins deux fichiers" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -769,7 +773,7 @@ msgstr "" "proviennent du premier fichier PO où elles ont été définies.\n" "Les positions de tous les fichiers PO seront cumulées.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -788,8 +792,8 @@ msgstr "" " (sans limite par défaut i.e. = à zéro)\n" " -u, --unique identique à « -< 2 ou --less-than=2 »\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -800,6 +804,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -816,12 +822,12 @@ msgstr "" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" " --omit-header omettre les en-têtes pour « msgid \"\" »\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Convertir un catalogue de traduction selon un encodage de caractères différent.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -832,8 +838,8 @@ msgstr "" " -t, --to-code=NOM NOM de l'encodage de sortie\n" "L'encodage par défaut se fait selon l'encodage locale.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -844,6 +850,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -859,20 +867,20 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "aucun fichier d'entrée fourni" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "exactement un fichier d'entrée requis" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Usage: %s [OPTION] FICHIER-D-ENTRÉE\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -885,7 +893,7 @@ msgstr "" "xgettext). Les entrées non traduites ont alors une traduction contenant\n" "le texte du champ « msgid » et sont marqués fuzzy.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -931,7 +939,7 @@ msgstr "" "Une commande spéciale interne appelée sorties « 0 » de traduction, suivi par un\n" "octet null. La sortie de \"msgexec 0\" est acceptable comme entrée pour \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -948,30 +956,30 @@ msgstr "" msgid "write to stdout failed" msgstr "échec d'écriture sur stdout" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "échec d'écriture au sous-processus %s" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "nom du filtre manquant" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "au moins un script sed doit être spécifié" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Usage: %s [OPTION] FILTRE [OPTIONS-DE-FILTRAGE]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Appliquer un filtre à toutes les traductions d'un catalogue de traductions.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -980,7 +988,7 @@ msgstr "" "Le FILTRE peut être n'importe quel programme qui lit une traduction à partir\n" "de l'entrée standard et qui modifie la traduction sur la sortie standard.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -995,8 +1003,8 @@ msgstr "" " aux commandes à exécuter\n" " -n, --quiet, --silent supprimer l'affichage automatique d'espace\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1008,6 +1016,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1024,24 +1034,24 @@ msgstr "" " -s, --sort-output générer une sortie triée\n" " -F, --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "ne peut opérer les Entrées/Sorties en mode non bloquant pour le sous-" "processus %s" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "échec de communication avec le sous-processus %s" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "échec de lecture du sous-processus %s" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "fin d'exécution du sous-processus %s avec le code de terminaison %d" @@ -1051,18 +1061,18 @@ msgstr "fin d'ex msgid "the argument to %s should be a single punctuation character" msgstr "l'argument de %s devrait être un simple caractère de ponctuation" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requiert une spécification de type \"-d directory\"" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requiert une spécification de type \"-l locale\"" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s est valable seulement avec %s" @@ -1420,14 +1430,14 @@ msgstr "cha msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" "l'option « %c » ne peut être utilisée avant que « K » ou « T » ne soit " "spécifié" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1436,7 +1446,7 @@ msgstr "" "Extraire tous les messages du catalogue de traduction qui concordent avec\n" "un patron particulier ou qui appartiennent à un fichier source donné.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1494,8 +1504,8 @@ msgstr "" " -f, --file=FICHIER obtenir le patron à partir du FICHIER\n" " -i, --ignore-case ignorer la distinction liée à la casse\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1506,6 +1516,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1521,11 +1533,11 @@ msgstr "" " --sort-output générer une sortie triée\n" " --sort-by-file trier la sortie selon la localisation des fichiers\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "écriture vers le sous-processus de grep a échoué" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1535,7 +1547,7 @@ msgstr "" "définir votre variable d'environnement LANG, tel que décrit dans\n" "le fichier ABOUT-NLS. Cela est nécessaire afin de tester votre traduction.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1546,12 +1558,12 @@ msgstr "" "SVP définir la locale à l'aide de l'option --locale ou\n" "du fichier de sortie .po à l'aide de l'option --output-file.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "%s créé.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1560,7 +1572,7 @@ msgstr "" "Créer un nouveau fichier PO en initialisant la méta-information avec des valeurs\n" "provenant de l'environnement de l'usager.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1573,7 +1585,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1587,19 +1599,21 @@ msgstr "" "--locale ou selon celle de l'usager. Si la sortie est -, les résultats sont écrits\n" "sur la sortie standard.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Détails de sortie:\n" " -l, --locale=LL_CC définir la locale cible\n" " -w, --width=NOMBRE initialiser la largeur de page\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1607,11 +1621,11 @@ msgstr "" "Plus d'un fichiers .pot repérés.\n" "SVP spécifier le fichier d'entrée .pot à l'aide de l'option --input.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "erreur de lecture du répertoire courant" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1619,23 +1633,23 @@ msgstr "" "Aucun fichier .pot dans le répertoire courant.\n" "SVP spécifier le fichier d'entrée .pot à l'aide de l'option --input.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "échec de fdopen()" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "Erreur d'E/S du sous-processus %s" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "échec du sous-processus %s avec le code de fin d'exécution %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1652,7 +1666,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Traduction anglaise du package %s" @@ -1690,7 +1704,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "AVERTISSEMENT: " @@ -1798,11 +1812,11 @@ msgstr "" "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). Cette " "version a été compilée sans iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "type d'archive" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1827,7 +1841,7 @@ msgstr "" "exact n'est pas possible, un appariement flou permet de produire de\n" "meilleurs résultats. \n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1844,7 +1858,7 @@ msgstr "" " -C, --compendium=FICHIER librairie additionnelle de messages traduits,\n" " peut-être spécifié plus d'une fois\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1855,7 +1869,7 @@ msgstr "" " -U, --update mettre à jour le fichier def.po,\n" " ne rien faire si le fichier def.po est déjà à jour\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1885,7 +1899,7 @@ msgstr "" "Le suffixe d'archive est « ~ », à moins que défini à l'aide de --suffix ou par la variable\n" "d'environnement SIMPLE_BACKUP_SUFFIX\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1900,15 +1914,15 @@ msgstr "" " -v, --verbose diagnostiquer toute anomalie dans chaque FICHIER\n" " -q, --quiet, --silent supprimer les indicateurs de progression\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "ce message devrait définir les formes au pluriel" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "ce message ne devrait pas définir les formes au pluriel" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1917,26 +1931,26 @@ msgstr "" "%s lus %ld anciens + %ld références, %ld fusionnés, %ld approximatives, %ld " "manquants, %ld périmés.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " terminé.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s et les noms de fichiers explicites s'excluent mutuellement" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Usage: %s [OPTION] [FICHIER]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "Convertir le catalogue binaire de messages au style Uniforum de fichiers .po\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1947,7 +1961,7 @@ msgstr "" " -j, --java mode Java: l'entrée est une classe Java ResourceBundle\n" " --tcl mode Tcl: l'entrée est un fichier .msg tcl/msgcat\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1959,7 +1973,7 @@ msgstr "" " -D, --directory=RÉPERTOIRE ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n" "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1974,7 +1988,7 @@ msgstr "" "Le nom de la classe est déterminé en ajoutant le nom de la locale au nom de la ressource,\n" "séparé par un souligné. La classe est localisée en utilisant CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1989,7 +2003,7 @@ msgstr "" "Les options -l et -d sont obligatoires. Le fichier .msg est localisé dans\n" "le répertoire spécifié.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2001,8 +2015,8 @@ msgstr "" " -o, --output-file=FICHIER écrire la sortie dans le FICHIER spécifié\n" "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2011,6 +2025,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Détails de sortie:\n" @@ -2022,7 +2038,7 @@ msgstr "" " -w, --width=COLONNES limiter le nombre de COLONNES en sortie\n" " -s, --sort-output générer une sortie triée\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2035,7 +2051,7 @@ msgstr "" " -V, --version identifier le programme, puis terminer\n" " -v, --verbose diagnostiquer toute anomalie dans chaque FICHIER\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2058,7 +2074,7 @@ msgstr "" "Les positions dans les fichiers seront cumulées. Lorsque l'option --unique\n" "est utilisée les duplicatas sont écartés.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2216,7 +2232,7 @@ msgstr "forme plurielle a un index erron msgid "too many errors, aborting" msgstr "trop d'erreurs, j'abandonne" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "séquence multi-octets invalide" @@ -2317,7 +2333,7 @@ msgstr "n'est pas un nom de classe Java valide: %s" msgid "failed to create \"%s\"" msgstr "échec de création de « %s »" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "erreur pendant l'écriture du fichier « %s »" @@ -2332,14 +2348,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "erreur lors de l'ouverture de « %s » en écriture" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "un message à traduire ne doit pas contenir la séquence d'échappement « \\%c »" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2354,12 +2370,12 @@ msgstr "" "ASCII à la place.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "incapable de fabriquer le fichier « %s »" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "sortie standard" @@ -2374,7 +2390,7 @@ msgstr "%s:%d: attention: constante caract msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: attention: constante chaîne sans terminateur" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "ce fichier ne peut contenir des directives de domaine" @@ -2393,26 +2409,26 @@ msgstr "%s:%d: nombre manquant apr msgid "%s:%d: invalid string expression" msgstr "%s:%d: expression de chaîne invalide" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing interdit si production sur sortie standard" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ne peut fonctionner sans mots clés à rechercher" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "attention: « %s » sans classification pour « %s », le langage C sera présumé" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extraire les chaînes traduisibles de fichiers d'entrée donnés.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2421,7 +2437,7 @@ msgstr "" "Les arguments obligatoires pour la forme longue des options sont aussi\n" "obligatoires pour les formes courtes qui leur correspondent.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2436,7 +2452,7 @@ msgstr "" " -p, --output-dir=RÉPERTOIRE placer les fichiers de sortie dans le RÉPERTOIRE\n" "Si la sortie est -, la sortie est écrite sur la sortie standard.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2455,7 +2471,7 @@ msgstr "" " -C, --c++ identique à --language=C++\n" "Par défaut, le langage est deviné selon l'extension du nom du fichier.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2470,7 +2486,7 @@ msgstr "" " -c, --add-comments[=CLÉ] sauver le commentaire précédent possédant CLÉ,\n" " ou celui qui précède immédiatement le mot-clef\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2488,8 +2504,8 @@ msgstr "" " --debug fournir plus de détails sur la reconnaissance\n" " des chaînes de format\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2500,6 +2516,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2525,11 +2543,11 @@ msgstr "" " -m, --msgstr-prefix[=CHAÎNE] préfixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n" " -M, --msgstr-suffix[=CHAÎNE] suffixer les msgstr's par CHAÎNE, sinon \\« \\ »\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrée standard" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2539,7 +2557,7 @@ msgstr "" "GNU gettext: gettext(\"\") retourne l'en-tête\n" "avec la méta information, pas une chaîne vide.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "langage « %s » inconnu" diff --git a/po/gl.gmo b/po/gl.gmo index 73c7b50be..eb41ccc65 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 9aaa1c78f..65f9f1237 100644 --- a/po/gl.po +++ b/po/gl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.10.39\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-07-28 17:00+0200\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -34,7 +34,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro ao abrir \"%s\" para lectura" @@ -243,11 +243,11 @@ 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -259,16 +259,16 @@ msgstr "" "ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n" "FIN DETERMINADO.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "demasiados argumentos" @@ -276,11 +276,11 @@ msgstr "demasiados argumentos" msgid "missing arguments" msgstr "faltan argumentos" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Use `%s --help' para máis información.\n" @@ -340,16 +340,16 @@ msgstr "" "que atopa no catálogo escollido.\n" "Directorio estándar de busca: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Comunique os erros a .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -369,9 +369,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -383,43 +383,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s son mutuamente excluíntes" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -428,8 +428,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -438,7 +438,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -450,7 +450,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -462,7 +462,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -474,6 +474,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -499,17 +501,17 @@ 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/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "o criterio de selección indicado é imposible (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -539,7 +541,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -549,7 +551,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -558,7 +560,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -587,7 +589,7 @@ 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:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -602,6 +604,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -627,7 +631,7 @@ 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/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -635,15 +639,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "non se indicou ningún ficheiro de entrada" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "precísanse exactamente dous ficheiros de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -683,22 +687,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "esta mensaxe úsase mais non está definida..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...mais esta definición é semellante" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensaxe úsase mais non está definida en %s" @@ -722,11 +726,11 @@ msgstr "definici msgid "...this is the location of the first definition" msgstr "...este é o lugar da primeira definición" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "téñense que indicar polo menos dous ficheiros" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -755,7 +759,7 @@ 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:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -784,7 +788,7 @@ 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:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -796,6 +800,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -822,12 +828,12 @@ 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/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -835,7 +841,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -847,6 +853,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -872,21 +880,21 @@ 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/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "non se indicou ningún ficheiro de entrada" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "precísanse exactamente dous ficheiros de entrada" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -895,7 +903,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -931,7 +939,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -944,39 +952,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "faltan argumentos" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "téñense que indicar polo menos dous ficheiros" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -986,7 +994,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -999,6 +1007,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1024,22 +1034,22 @@ 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/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1049,18 +1059,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1380,19 +1390,19 @@ msgstr "entrada `msgstr' difusa ignorada" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1423,7 +1433,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1435,6 +1445,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1460,18 +1472,18 @@ 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/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1479,19 +1491,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1500,7 +1512,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1509,48 +1521,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1562,7 +1576,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1596,7 +1610,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 #, fuzzy msgid "warning: " msgstr "%s: aviso: " @@ -1681,12 +1695,12 @@ msgstr "" "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n" "Esta versión foi compilada sen iconv().\n" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" # src/msgmerge.c:324 -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1711,7 +1725,7 @@ msgstr "" "para producir mellores resultados. Os resultados escríbense na saída\n" "estándar a menos que se indique un ficheiro de saída.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1722,7 +1736,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1730,7 +1744,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1747,7 +1761,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1757,17 +1771,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensaxe úsase mais non está definida en %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensaxe úsase mais non está definida en %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1776,26 +1790,26 @@ msgstr "" "%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %" "ld, obsoletas %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " rematado.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s son mutuamente excluíntes" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1803,7 +1817,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1811,7 +1825,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1821,7 +1835,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1831,7 +1845,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1840,7 +1854,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1850,6 +1864,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Uso: %s [OPCIÓN] [FICHEIRO]...\n" @@ -1866,7 +1882,7 @@ 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/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1875,7 +1891,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1888,7 +1904,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2040,7 +2056,7 @@ msgstr "a forma do plural ten un msgid "too many errors, aborting" msgstr "demasiados erros, interrompendo" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "secuencia multibyte non válida" @@ -2143,7 +2159,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "erro ao escribi-lo ficheiro \"%s\"" @@ -2157,14 +2173,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "erro ao abrir \"%s\" para escribir" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2173,12 +2189,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "non se pode crea-lo ficheiro de saída \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "saída estándar" @@ -2193,7 +2209,7 @@ msgstr "%s:%d: aviso: constante de tipo car msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: aviso: literal de cadea non rematada" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "este ficheiro non pode conter directivas de dominio" @@ -2212,32 +2228,32 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext non funciona sen palabras chave polas que buscar" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2247,7 +2263,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2259,7 +2275,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2269,7 +2285,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2280,7 +2296,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2292,6 +2308,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2322,18 +2340,18 @@ 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/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrada estándar" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "linguaxe `%s' descoñecida" diff --git a/po/id.gmo b/po/id.gmo index dbd62019a..3f647083c 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index d44742f41..40fe2e0c5 100644 --- a/po/id.po +++ b/po/id.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.35\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 1999-09-19 10:24+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -28,7 +28,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "kesalahan saat membuka \"%s\" untuk dibaca" @@ -235,11 +235,11 @@ msgid "" msgstr "spesifikasi format untuk argumen %u tidak sama" # ) -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,16 +250,16 @@ msgstr "" "Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n" "jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Ditulis oleh %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "terlalu banyak argumen" @@ -267,11 +267,11 @@ msgstr "terlalu banyak argumen" msgid "missing arguments" msgstr "Argumen hilang" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih jauh.\n" @@ -332,16 +332,16 @@ msgstr "" "diterjemahkan.\n" "Direktori pencarian standar: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Laporkan kesalahan ke .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -361,9 +361,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -375,43 +375,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s dan %s adalah mutually exclusive" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -420,8 +420,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -430,7 +430,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -442,7 +442,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -454,7 +454,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -466,6 +466,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -485,17 +487,17 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -523,7 +525,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -533,7 +535,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -542,7 +544,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -569,7 +571,7 @@ 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:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -584,6 +586,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -603,7 +607,7 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -611,15 +615,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "tidak diberikan file input" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "dibutuhkan tepat 2 file input" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -657,22 +661,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "pesan ini digunakan tapi tidak didefinisikan..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...tetapi definisi ini serupa" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" @@ -695,11 +699,11 @@ msgstr "definisi pesan ganda" msgid "...this is the location of the first definition" msgstr "...ini adalah lokasi definisi pertama" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "paling tidak dua file harus dispesifikasikan" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -726,7 +730,7 @@ 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:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -753,7 +757,7 @@ 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:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -765,6 +769,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -785,12 +791,12 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -798,7 +804,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -810,6 +816,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -829,21 +837,21 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "tidak diberikan file input" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "dibutuhkan tepat 2 file input" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -852,7 +860,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -888,7 +896,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -901,39 +909,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "Argumen hilang" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "paling tidak dua file harus dispesifikasikan" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -943,7 +951,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -956,6 +964,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -975,22 +985,22 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1000,18 +1010,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1318,19 +1328,19 @@ msgstr "masukan fuzzy `msgstr' diabaikan" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: peringatan: file source mengandung terjemahan fuzzy" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1361,7 +1371,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1373,6 +1383,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1392,18 +1404,18 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1411,19 +1423,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1432,7 +1444,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1441,48 +1453,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1494,7 +1508,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1528,7 +1542,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1608,11 +1622,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1635,7 +1649,7 @@ msgstr "" "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n" "ke stdout kecuali diberikan sebuah output file.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1646,7 +1660,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1654,7 +1668,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1671,7 +1685,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1681,17 +1695,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1700,26 +1714,26 @@ msgstr "" "%sMembaca %d lama + %d referensi, digabung %d, fuzzy %d, hilang %d, kuno %" "d.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " selesai.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s dan %s adalah mutually exclusive" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1727,7 +1741,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1735,7 +1749,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1745,7 +1759,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1755,7 +1769,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1764,7 +1778,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1774,6 +1788,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Pemakaian: %s [PILIHAN] [FILE]...\n" @@ -1788,7 +1804,7 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1797,7 +1813,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1810,7 +1826,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1958,7 +1974,7 @@ msgstr "" msgid "too many errors, aborting" msgstr "terlalu banyak kesalahan, dibatalkan" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "" @@ -2060,7 +2076,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "kesalahan saat menulis file \"%s\"" @@ -2074,13 +2090,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "kesalahan ketika membuka \"%s\" untuk ditulis" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2089,12 +2105,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "tidak dapat membuat file output \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard output" @@ -2109,7 +2125,7 @@ msgstr "%s:%d: peringatan: karakter konstan yang unterminated" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: peringatan: string literal yang unterminated" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "file ini tidak boleh mengandung direktiv domain" @@ -2128,32 +2144,32 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2163,7 +2179,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2175,7 +2191,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2185,7 +2201,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2196,7 +2212,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2208,6 +2224,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2232,18 +2250,18 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -w, --width=NUMBER set lebar halaman output\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "bahasa `%s' tidak dikenal" diff --git a/po/it.gmo b/po/it.gmo index 3e1fa0e3e..0de595fb4 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 1dc389613..850b9f1e9 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.35\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2000-02-17 15:30+01:00\n" "Last-Translator: Giovanni Bortolozzo \n" "Language-Team: Italian \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "errore durante l'apertura in lettura di \"%s\"" @@ -239,11 +239,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "le specifiche di formato per l'argomento %u non sono le stesse" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,16 +255,16 @@ msgstr "" "NON c'è nessuna garanzia; neppure di COMMERCIABILITÀ o di IDONEITÀ AD UN\n" "PARTICOLARE SCOPO.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Scritto da %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "troppi argomenti" @@ -272,11 +272,11 @@ msgstr "troppi argomenti" msgid "missing arguments" msgstr "mancano degli argomenti" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare `%s --help' per ulteriori informazioni.\n" @@ -338,16 +338,16 @@ msgstr "" "catalogo selezionato.\n" "Directory di ricerca standard: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Segnalare i bug a .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -367,9 +367,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -381,43 +381,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s sono mutuamente esclusive" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -426,8 +426,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -436,7 +436,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -448,7 +448,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -460,7 +460,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -472,6 +472,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -495,17 +497,17 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -535,7 +537,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -545,7 +547,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -554,7 +556,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -583,7 +585,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -598,6 +600,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -621,7 +625,7 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -629,15 +633,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "non sono specificati file d'ingresso" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "sono richiesti esattamente 2 file d'ingresso" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -676,22 +680,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "questo messaggio è usato ma non definito..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ma questa definizione è simile" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "questo messaggio è usato ma non è definito in %s" @@ -714,11 +718,11 @@ msgstr "definizione del messaggio duplicata" msgid "...this is the location of the first definition" msgstr "...questa è la posizione della prima definizione" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "devono essere specificati almeno due file" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -747,7 +751,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -776,7 +780,7 @@ msgstr "" "solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n" "nei file di tutti i file PO.\n" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -788,6 +792,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -812,12 +818,12 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -825,7 +831,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -837,6 +843,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -860,21 +868,21 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "non è specificato nessun file d'ingresso" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "sono richiesti esattamente 2 file d'ingresso" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -883,7 +891,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -919,7 +927,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -932,39 +940,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "mancano degli argomenti" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "devono essere specificati almeno due file" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -974,7 +982,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -987,6 +995,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1010,22 +1020,22 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1035,18 +1045,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1356,19 +1366,19 @@ msgstr "ignorata la voce `msgstr' approssimativa" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1399,7 +1409,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1411,6 +1421,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1434,18 +1446,18 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1453,19 +1465,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1474,7 +1486,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1483,48 +1495,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1536,7 +1550,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1570,7 +1584,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1650,11 +1664,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1679,7 +1693,7 @@ msgstr "" "approssimativa (fuzzy) per ottenere risultati migliori. I risultati sono\n" "scritti su stdout a meno che non sia specificato un file d'uscita.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1690,7 +1704,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1698,7 +1712,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1715,7 +1729,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1725,17 +1739,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "questo messaggio è usato ma non è definito in %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "questo messaggio è usato ma non è definito in %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1744,26 +1758,26 @@ msgstr "" "%sLetti %d vecchi + %d riferimenti, fusi %d, fuzzy %d, persi %d, obsoleti %" "d.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " fatto.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s sono mutuamente esclusive" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1771,7 +1785,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1779,7 +1793,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1789,7 +1803,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1799,7 +1813,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1808,7 +1822,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1818,6 +1832,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Uso: %s [OPZIONE] [FILE]...\n" @@ -1835,7 +1851,7 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1844,7 +1860,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1857,7 +1873,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2006,7 +2022,7 @@ msgstr "" msgid "too many errors, aborting" msgstr "troppi errori, annullato" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "" @@ -2108,7 +2124,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "errore durante la scrittura del file \"%s\"" @@ -2122,7 +2138,7 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "errore durante l'apertura in scrittura di \"%s\"" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2130,7 +2146,7 @@ msgstr "" "i messaggi internazionalizzati non devono contenere la sequenza di escape `\\" "%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2139,12 +2155,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "impossibile creare il file d'uscita \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard output" @@ -2159,7 +2175,7 @@ msgstr "%s:%d: attenzione: costante carattere non terminata" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: attenzione: letterale stringa non terminato" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "questo file potrebbe non contenere direttive di dominio" @@ -2178,33 +2194,33 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing non può essere usato quando l'output è scritto su stdout" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "attenzione: il file `%s' ha estensione `%s' sconosciuta: proverò con C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2214,7 +2230,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2226,7 +2242,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2236,7 +2252,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2247,7 +2263,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2259,6 +2275,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2287,18 +2305,18 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard input" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "linguaggio `%s' sconosciuto" diff --git a/po/ja.gmo b/po/ja.gmo index 78827a213..5fae90eb6 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 055785c4f..ce4669866 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-04-22 22:25+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" @@ -239,11 +239,11 @@ msgid "" msgstr "" "°ú¿ô '%2$s' ¤ËÂФ¹¤ë 'msgid' ¤È '%1$s' ¤Ç¤Î·Á¼°»ØÄ꤬Ʊ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -259,16 +259,16 @@ msgstr "" "»Ô¾ìÀ­µÚ¤ÓÆÃÄêÌÜŪŬ¹çÀ­¤ÎÇ¡²¿¤Ë¤è¤é¤º, ¤¤¤«¤Ê¤ëÊݾڤ⤢¤ê¤Þ¤»¤ó.\n" "\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "ºî¼Ô %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹" @@ -276,11 +276,11 @@ msgstr " msgid "missing arguments" msgstr "°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï `%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n" @@ -341,15 +341,15 @@ msgstr "" "ËÝÌõ¤µ¤ì¤¿¤â¤Î¤òɽ¼¨¤·¤Þ¤¹.\n" "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï ¤Þ¤Ç.\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]\n" @@ -374,9 +374,9 @@ msgstr "" " ÊÌ̾ (¥¨¥¤¥ê¥¢¥¹) ¤ò´Þ¤à\n" " -i, --ip-address ¥Û¥¹¥È̾¤ËÂФ¹¤ë¥¢¥É¥ì¥¹\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -391,43 +391,43 @@ msgstr "" msgid "could not get host name" msgstr "¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "ºÇÂç 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬µö¤µ¤ì¤Þ¤¹" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, 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:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -440,8 +440,8 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -453,7 +453,7 @@ msgstr "" " -o, --output-file=FILE »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -472,7 +472,7 @@ msgstr "" " --no-obsolete ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤òºï½ü\n" " --only-obsolete ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤ò»Ä¤¹\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -489,8 +489,8 @@ msgstr "" " --set-obsolete Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'ÇѤ줿' ¾õÂÖ¤ËÀßÄê\n" " --clear-obsolete Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'ÇѤ줿' ¾õÂ֤Ǥʤ¤¤â¤Î¤ËÀßÄê\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -501,6 +501,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -517,17 +519,17 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -550,7 +552,7 @@ msgstr "" "¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ\n" "¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -565,7 +567,7 @@ msgstr "" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -577,7 +579,7 @@ msgstr "" " -o, --output-file=FILE »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -597,8 +599,8 @@ msgstr "" " -u, --unique --less-than=2 ¤Îû½Ì·Á. 1¤Ä¤·¤«¤Ê¤¤¥á¥Ã¥»¡¼¥¸\n" " ¤Î¤ß¤òɽ¼¨\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -612,6 +614,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -631,7 +635,7 @@ msgstr "" " -s, --sort-output ʤÓÂؤ¨¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤Ç½ÐÎϤòʤÓÂؤ¨¤ë\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -642,15 +646,15 @@ msgstr "" " -h, --help ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n" " -V, --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "Àµ³Î¤Ë 2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] def.po ref.pot\n" @@ -686,7 +690,7 @@ msgstr "" " ref.pot ¥½¡¼¥¹¤Ø¤Î»²¾È\n" " -D, --directory=DIRECTORY ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -695,15 +699,15 @@ msgstr "" "Áàºî»ØÄê:\n" " -m, --multi-domain ref.pot ¤ò def.po Æâ¤Î¥É¥á¥¤¥ó¤Î³Æ¡¹¤ËŬÍÑ\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...¤·¤«¤·¤³¤ÎÄêµÁ¤¬»÷¤Æ¤¤¤Þ¤¹" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ %s ¤Ç¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" @@ -727,11 +731,11 @@ msgstr " msgid "...this is the location of the first definition" msgstr "...¤³¤ì¤ÏºÇ½é¤ÎÄêµÁ¤Ë¤¢¤ê¤Þ¤¹" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "¾¯¤Ê¤¯¤È¤â 2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -751,7 +755,7 @@ msgstr "" "¥³¥á¥ó¥È¤Ï, ¤½¤ì¤é¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤Î¤ß¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" "¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -770,8 +774,8 @@ msgstr "" " -u, --unique --less-than=2 ¤Îû½Ì·Á. 1¤Ä¤·¤«¤Ê¤¤¥á¥Ã¥»¡¼¥¸\n" " ¤Î¤ß¤òɽ¼¨\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -782,6 +786,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -800,12 +806,12 @@ msgstr "" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" " --omit-header `msgid \"\"' ¤ò´Þ¤ó¤À¥Ø¥Ã¥À¤ò½ÐÎϤ·¤Ê¤¤\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "ËÝÌõ¥«¥¿¥í¥°¤ò°Û¤Ê¤Ã¤¿Ê¸»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -816,8 +822,8 @@ msgstr "" " -t, --to-code=NAME ½ÐÎϤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n" "ɸ½à¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¸½ºß¤Î¥í¡¼¥«¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -828,6 +834,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -844,20 +852,20 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "Àµ³Î¤Ë 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] INPUTFILE\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -869,7 +877,7 @@ msgstr "" "PO ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë (°ìÈÌ¤Ë xgettext ¤Ë¤è¤Ã¤ÆÀ¸À®) ¤Ç¤¹. ̤ËÝÌõ¤Î¥¨¥ó¥È¥ê\n" "¤Ï msgid ¤ÈƱ¤¸ËÝÌõ¤Ë³ä¤êÅö¤Æ¤é¤ì, fuzzy ¤Î°õ¤¬ÉÕ¤±¤é¤ì¤Þ¤¹.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -915,7 +923,7 @@ msgstr "" "'0' ¤È¤¤¤¦ÆÃÊ̤ÊÁȤ߹þ¤ß¥³¥Þ¥ó¥É¤ÏºÇ¸å¤Ë¥Ì¥ëʸ»ú¤òÉÕ¤±¤ÆËÝÌõ¤ò½ÐÎϤ·¤Þ¤¹.\n" "\"msgexec 0\" ¤Î½ÐÎÏ¤Ï \"xargs -0\" ¤Ø¤ÎÆþÎϤËŬ¤·¤Æ¤¤¤Þ¤¹.\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -932,30 +940,30 @@ msgstr "" msgid "write to stdout failed" msgstr "ɸ½à½ÐÎϤؤνñ¤­½Ð¤·¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "%s ¤Ø½ñ¤­½Ð¤¹¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "¥Õ¥£¥ë¥¿Ì¾¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "¾¯¤Ê¤¯¤È¤â 1¤Ä¤Î sed ¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] ¥Õ¥£¥ë¥¿ [¥Õ¥£¥ë¥¿¥ª¥×¥·¥ç¥ó]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "ËÝÌõ¥«¥¿¥í¥°¤ÎÁ´¤Æ¤ÎËÝÌõ¤Ë¥Õ¥£¥ë¥¿¤òŬÍÑ.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -964,7 +972,7 @@ msgstr "" "FILTER ¤È¤·¤Æ¤Ï, ɸ½àÆþÎϤ«¤éËÝÌõ¤òÆɤ߼è¤ê, ½¤Àµ¤·¤¿ËÝÌõ¤òɸ½à½ÐÎϤؽñ¤­½Ð¤¹\n" "Ǥ°Õ¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -978,8 +986,8 @@ msgstr "" " -f, --file=SCRIPTFILE SCRIPTFILE ¤ÎÆâÍƤò¼Â¹Ô¤µ¤ì¤ë¥³¥Þ¥ó¥É¤ËÄɲÃ\n" " -n, --quiet, --silent ¥Ñ¥¿¡¼¥ó¥¹¥Ú¡¼¥¹¤Î¼«Æ°Åª¤Êɽ¼¨¤òÍÞÀ©\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -991,6 +999,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1008,22 +1018,22 @@ msgstr "" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " -F, --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤Ë¥Ö¥í¥Ã¥­¥ó¥°¤·¤Ê¤¤Æþ½ÐÎϤòÀßÄê¤Ç¤­¤Þ¤»¤ó" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤È¤ÎÄÌ¿®¤Ë¼ºÇÔ" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬½ªÎ»¥³¡¼¥É %d ¤Ç½ªÎ»" @@ -1033,18 +1043,18 @@ msgstr "%s msgid "the argument to %s should be a single punctuation character" msgstr "%s ¤Ø¤Î°ú¿ô¤Ïñ°ì¤Î¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s ¤Ë¤Ï \"-d ¥Ç¥£¥ì¥¯¥È¥ê\" ¤Î»ØÄ꤬ɬÍפǤ¹" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s ¤Ë¤Ï \"-l ¥í¥«¡¼¥ë\" ¤Î»ØÄ꤬ɬÍפǤ¹" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s ¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹" @@ -1398,12 +1408,12 @@ msgstr " msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "¥ª¥×¥·¥ç¥ó '%c' ¤Ï 'K' ¤ä 'T' ¤¬»ØÄꤵ¤ì¤ëÁ°¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1412,7 +1422,7 @@ msgstr "" "ËÝÌõ¥«¥¿¥í¥°¤ÎÃ椫¤é, »ØÄꤵ¤ì¤¿¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë, ¤â¤·¤¯¤Ï»ØÄꤵ¤ì¤¿¤¤¤¯¤Ä\n" "¤«¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ëÁ´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1470,8 +1480,8 @@ msgstr "" " -f, --file=FILE PATTERN ¤ò FILE ¤«¤é»ØÄê\n" " -i, --ignore-case Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1482,6 +1492,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1498,11 +1510,11 @@ msgstr "" " --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" " --sort-by-file ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "grep ¥µ¥Ö¥×¥í¥»¥¹¤Ø¤Î½ñ¤­½Ð¤·¤Ë¼ºÇÔ" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1511,7 +1523,7 @@ msgstr "" "¤¢¤Ê¤¿¤Ï¸À¸ì¤Ë´Ø¤ï¤ê¤Î¤Ê¤¤´Ä¶­¤Ë¤¤¤Þ¤¹. ABOUT-NLS ¤Ëµ­½Ò¤µ¤ì¤¿¤è¤¦¤Ë\n" "´Ä¶­ÊÑ¿ô LANG ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤. ¤³¤ì¤ÇËÝÌõ¤ò¥Æ¥¹¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1522,19 +1534,19 @@ msgstr "" "--locale ¥ª¥×¥·¥ç¥ó¤Ç¥í¥«¡¼¥ë¤ò»ØÄꤹ¤ë¤«, --output-file ¥ª¥×¥·¥ç¥ó¤Ç\n" "½ÐÎϤ¹¤ë .po ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "%s ¤òÀ¸À®.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1547,7 +1559,7 @@ msgstr "" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ç POT ¥Õ¥¡¥¤¥ë¤¬¸¡º÷\n" "¤µ¤ì¤Þ¤¹. ¤â¤·ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Ê¤é¤Ðɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1560,20 +1572,22 @@ msgstr "" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç, ½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ï --locale ¥ª¥×¥·¥ç¥ó¤«¥æ¡¼¥¶¤Î\n" "¥í¥«¡¼¥ëÀßÄê¤Ë°Í¸¤·¤Þ¤¹. ¤â¤· - ¤Ê¤é¤Ð·ë²Ì¤Ïɸ½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "½ÐÎϤξܺÙ:\n" " -l, --locale=LL_CC ÂоݤȤʤë¥í¥«¡¼¥ë¤òÀßÄê\n" " --no-translator PO ¥Õ¥¡¥¤¥ë¤¬¼«Æ°À¸À®¤µ¤ì¤ë¤È²¾Äê\n" " -w, --width=NUMBER ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1581,11 +1595,11 @@ msgstr "" "1¤Ä°Ê¾å¤Î .pot ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤Þ¤·¤¿.\n" "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1593,23 +1607,23 @@ msgstr "" "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë .pot ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿.\n" "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() ¼ºÇÔ" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹Æþ½ÐÎÏ¥¨¥é¡¼" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¼ºÇÔ, ½ªÎ»¥³¡¼¥É %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1626,7 +1640,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ" @@ -1663,7 +1677,7 @@ msgstr "" "ÂоݤȤʤëʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "·Ù¹ð: " @@ -1768,11 +1782,11 @@ msgstr "" "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹.¤³¤Î¥Ð¡¼" "¥¸¥ç¥ó¤Ï iconv() ¤Ê¤·¤Çºî¤é¤ì¤Æ¤¤¤Þ¤¹." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥¿¥¤¥×" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1794,7 +1808,7 @@ msgstr "" "»Ä¤µ¤ì¤Þ¤¹. Àµ³Î¤Ë°ìÃפ·¤Æ¤¤¤ë¸Ä½ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï, ¤¢¤¤¤Þ¤¤ (fuzzy)\n" "¸¡º÷¤ò»È¤¦¤È¤è¤êÎɤ¤·ë²Ì¤òÀ¸¤à¤Ç¤·¤ç¤¦. \n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1811,7 +1825,7 @@ msgstr "" " -C, --compendium=FILE ¥á¥Ã¥»¡¼¥¸ËÝÌõ¤ÎÄɲÃʸ¸¥\n" " 1²ó°Ê¾å»ØÄꤵ¤ì¤ë²ÄǽÀ­¤¢¤ê\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1822,7 +1836,7 @@ msgstr "" " -U, --update def.po ¤ò¹¹¿·\n" " def.po ¤¬´û¤ËºÇ¿·ÈǤǤ¢¤ì¤Ð²¿¤â¤·¤Ê¤¤\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1851,7 +1865,7 @@ msgstr "" "--suffix ¤ä´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð,\n" "¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤Ï `~' ¤Ç¤¹.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1866,15 +1880,15 @@ msgstr "" " -v, --verbose ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n" " -q, --quiet, --silent ¿Ê¹Ô¾õ¶·¤òɽ¼¨¤·¤Ê¤¤\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤¹" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1883,26 +1897,26 @@ msgstr "" "%s %ld(Á°¤ÎÈÇ) + %ld(¿·ÈÇ) ¤òÆɤ߹þ¤ß (¥Þ¡¼¥¸ %ld, ¤¢¤¤¤Þ¤¤ %ld, ·çÍî %ld, ÇË" "´þ %ld).\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " ´°Î».\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ¤ÈÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤ÏÇØÈ¿¤Ç¤¹" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò Uniforum ·Á¼°¤Î .po ¥Õ¥¡¥¤¥ë¤ËÊÑ´¹.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1913,7 +1927,7 @@ msgstr "" " -j, --java Java ¥â¡¼¥É: ÆþÎÏ¤Ï Java ResourceBundle ¥¯¥é¥¹\n" " --tcl Tcl ¥â¡¼¥É: ÆþÎÏ¤Ï tcl/msgcat .msg ¥Õ¥¡¥¤¥ë\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1924,7 +1938,7 @@ msgstr "" " FILE ... ÆþÎÏ .mo ¥Õ¥¡¥¤¥ë\n" "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1939,7 +1953,7 @@ msgstr "" "¥¯¥é¥¹Ì¾¤Ï, ¥ê¥½¡¼¥¹Ì¾¤ÎËöÈø¤Ë²¼ÉÕ¤­¥Ð¡¼ \"_\" ¤ò¶´¤ó¤Ç¥í¥«¡¼¥ë̾¤ò²Ã¤¨¤ë¤³¤È\n" "¤Ç·è¤á¤é¤ì¤Þ¤¹. ¥¯¥é¥¹¤Î¾ì½ê¤Ï CLASSPATH ¤Ç»ØÄꤵ¤ì¤Þ¤¹.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1953,7 +1967,7 @@ msgstr "" " -d DIRECTORY ¥¯¥é¥¹¥Ç¥£¥ì¥¯¥È¥ê¤Î³¬ÁؤδðËܥǥ£¥ì¥¯¥È¥ê\n" "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1965,8 +1979,8 @@ msgstr "" " -o, --output-file=FILE »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1975,6 +1989,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "½ÐÎϤξܺÙ:\n" @@ -1987,7 +2003,7 @@ msgstr "" " -w, --width=NUMBER ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n" " -s, --sort-output ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2000,7 +2016,7 @@ msgstr "" " -V, --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n" " -v, --verbose ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2021,7 +2037,7 @@ msgstr "" "ºÇ½é¤ÎËÝÌõ¤«¤é¼è¤ê½Ð¤µ¤ì¤Þ¤¹. ¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤Ϥ½¤Î¤Þ¤Þ»Ä¤ê¤Þ¤¹. --unique\n" "¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤È½ÅÊ£¤Ï̵»ë¤µ¤ì¤Þ¤¹.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2174,7 +2190,7 @@ msgstr "Ê£ msgid "too many errors, aborting" msgstr "¥¨¥é¡¼¤¬Â¿²á¤®¤ë¤Î¤Ç, ½èÍý¤òÂǤÁÀÚ¤ê¤Þ¤¹" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "ÉÔÀµ¤ÊÊ£¿ô¥Ð¥¤¥È¤Î¥·¡¼¥±¥ó¥¹" @@ -2275,7 +2291,7 @@ msgstr " msgid "failed to create \"%s\"" msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" ¥Õ¥¡¥¤¥ë¤ò½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" @@ -2290,7 +2306,7 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "\"%s\" ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2298,7 +2314,7 @@ msgstr "" "¹ñºÝ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï `\\%c' ¤È¤¤¤¦¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ò´Þ¤ó¤Ç¤Ï¤¤¤±¤Þ¤»" "¤ó" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2312,12 +2328,12 @@ msgstr "" "¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\" ¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "ɸ½à½ÐÎÏ" @@ -2332,7 +2348,7 @@ msgstr "%s:%d: msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹" @@ -2351,25 +2367,25 @@ msgstr "%s:%d: # msgid "%s:%d: invalid string expression" msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóɽ¸½" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing ¤Ï½ÐÎÏÀ褬ɸ½à½ÐÎϤξì¹ç¤Ë¤Ï»È¤¨¤Þ¤»¤ó" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë `%s' (³ÈÄ¥»Ò `%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2378,7 +2394,7 @@ msgstr "" "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n" "ɬ¿Ü¤Ç¤Ê¤¤°ú¿ô¤âƱ¤¸¤Ç¤¹.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2393,7 +2409,7 @@ msgstr "" " -p, --output-dir=DIR ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n" "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2412,7 +2428,7 @@ msgstr "" " -C, --c++ --language=C++ ¤Îû½Ì·Á\n" "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2427,7 +2443,7 @@ msgstr "" " -c, --add-comments[=TAG] TAG (¤Þ¤¿¤Ï¥­¡¼¥ï¡¼¥É¹Ô) ¤òÉÕ¤±¤Æ\n" " ¥³¥á¥ó¥ÈÉôʬ¤ò½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2444,8 +2460,8 @@ msgstr "" " -T, --trigraphs ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n" " --debug ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2456,6 +2472,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2482,11 +2500,11 @@ msgstr "" " -m, --msgstr-prefix[=STRING] msgstr ¹àÌܤÎÀÜƬ¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n" " -M, --msgstr-suffix[=STRING] msgstr ¹àÌܤÎÀÜÈø¼­¤È¤·¤Æ STRING ¤« \"\" ¤ò»ÈÍÑ\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "ɸ½àÆþÎÏ" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2496,7 +2514,7 @@ msgstr "" "gettxt(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n" "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "¸À¸ì `%s' ¤ÏÃΤê¤Þ¤»¤ó" diff --git a/po/ko.gmo b/po/ko.gmo index c75cd247b..38293188c 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 81f66b09b..f034bab9b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-14 12:04+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "Àбâ À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý" @@ -239,11 +239,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ 'msgid'¿Í '%s'ÀÇ ¼­½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -254,16 +254,16 @@ msgstr "" "ÀÌ ÇÁ·Î±×·¥Àº ÀÚÀ¯ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n" "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "%sÀÌ(°¡) ¸¸µé¾ú½À´Ï´Ù.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "Àμö°¡ ³Ê¹« ¸¹À½" @@ -271,11 +271,11 @@ msgstr " msgid "missing arguments" msgstr "Àμö°¡ ºüÁ³À½" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n" @@ -336,15 +336,15 @@ msgstr "" "¸ñ·Ï¿¡¼­ ¹ø¿ªµÇ¾î ÀÖ´Â ¸Þ½ÃÁö¸¸ÀÌ Ãâ·ÂµË´Ï´Ù.\n" "±âº» Ž»ö µð·ºÅ丮: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "·Î ¹®Á¦Á¡À» ¾Ë·Á ÁֽʽÿÀ.\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>]\n" @@ -369,9 +369,9 @@ msgstr "" " Domain Name) ¹× º°¸í(alias)µéÀ» ¸ðµÎ Æ÷ÇÔ\n" " -i, --ip-address È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -386,28 +386,28 @@ msgstr "" msgid "could not get host name" msgstr "È£½ºÆ®À̸§À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "ÃÖ´ë ÇÑ °³ÀÇ ÀÔ·ÂÆÄÀϸ¸ÀÌ Çã¿ëµË´Ï´Ù" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s°ú(¿Í) %sÀº(´Â) ¼­·Î ¹èŸÀûÀÔ´Ï´Ù" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "»ç¿ë¹ý: %s [¿É¼Ç] [ÀÔ·ÂÆÄÀÏ]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -416,15 +416,15 @@ msgstr "" "¹ø¿ª ¸Þ¼¼ÁöµéÀ» ±× ¼Ó¼º¿¡ µû¶ó °É·¯³»°í, ±× ¼Ó¼ºÀ» Á¶ÀÛÇÕ´Ï´Ù.\n" "\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -437,8 +437,8 @@ msgstr "" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -451,7 +451,7 @@ msgstr "" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, °á°ú¹°À» Ç¥ÁØ Ãâ·ÂÀ¸·Î \n" "Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -470,7 +470,7 @@ msgstr "" " --no-obsolete ¾ø¾îÁø #~ ¸Þ¼¼Áö¸¦ Áö¿ó´Ï´Ù\n" " --only-obsolete ¾ø¾îÁø #~ ¸Þ¼¼Áö¸¦ ³ö µÓ´Ï´Ù\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -489,8 +489,8 @@ msgstr "" " --fuzzy \"--only-fuzzy --clear-fuzzy\"¿Í µ¿ÀÏÇÕ´Ï´Ù\n" " --obsolete \"--only-obsolete --clear-obsolete\"¿Í µ¿ÀÏÇÕ´Ï´Ù\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -501,6 +501,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -516,17 +518,17 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "ºÒ°¡´ÉÇÑ ¼±Åà Á¶°ÇÀ» ÁöÁ¤ÇÏ¿´½À´Ï´Ù (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<ÀÔ·ÂÆÄÀÏ>]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -549,7 +551,7 @@ msgstr "" "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n" "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -563,7 +565,7 @@ msgstr "" " -f, --files-from=<ÆÄÀÏ> <ÆÄÀÏ>¿¡¼­ ÀÔ·Â ÆÄÀÏÀÇ ¸í´ÜÀ» ÀнÀ´Ï´Ù\n" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -576,7 +578,7 @@ msgstr "" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, °á°ú¹°À» Ç¥ÁØ Ãâ·ÂÀ¸·Î\n" "\"Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -597,8 +599,8 @@ msgstr "" " -u, --unique \"--less-than=2\"¸¦ ª°Ô ¾´ °ÍÀÔ´Ï´Ù, ÇÑ ¹ø¸¸\n" " ³ª¿À´Â ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -612,6 +614,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -630,7 +634,7 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -641,15 +645,15 @@ msgstr "" " -h, --help ÀÌ µµ¿ò¸»À» Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í ³¡³³´Ï´Ù\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "Á¤È®È÷ 2°³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] def.po ref.pot\n" @@ -685,7 +689,7 @@ msgstr "" " ref.pot ¼Ò½º¿¡ ´ëÇÑ ÂüÁ¶\n" " -D, --directory=<µð·ºÅ丮> ÀÔ·Â ÆÄÀÏ Å½»ö ¸í´Ü¿¡ <µð·ºÅ丮>¸¦ Ãß°¡ÇÕ´Ï´Ù\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -694,15 +698,15 @@ msgstr "" "µ¿ÀÛ º¯È­:\n" " -m, --multi-domain ref.pot ÆÄÀÏÀ» def.poÀÇ °¢ µµ¸ÞÀο¡ Àû¿ëÇÕ´Ï´Ù\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ÇÏÁö¸¸ ÀÌ Á¤ÀÇ´Â À¯»çÇÕ´Ï´Ù" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "ÀÌ ¸Þ½ÃÁö´Â »ç¿ëµÇÁö¸¸ %s¿¡¼­ Á¤ÀǵÇÁö ¾Ê¾Ò½À´Ï´Ù" @@ -725,11 +729,11 @@ msgstr " msgid "...this is the location of the first definition" msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "ÃÖ¼ÒÇÑ µÎ °³ÀÇ ÆÄÀÏÀ» ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -750,7 +754,7 @@ msgstr "" "³ªÅ¸³ª´Â °¡Àå ù ¹ø° PO ÆÄÀÏ¿¡ µé¾î ÀÖ´Â ¸ðµç PO ÆÄÀÏ¿¡¼­ ÆÄÀÏ \n" "À§Ä¡´Â ±×´ë·Î À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -771,8 +775,8 @@ msgstr "" " -u, --unique \"--less-than=2\"¸¦ ª°Ô ¾´ °ÍÀÔ´Ï´Ù, ÇÑ ¹ø¸¸\n" " ³ª¿À´Â ¸Þ¼¼Áö¸¸À» Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -783,6 +787,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -800,12 +806,12 @@ msgstr "" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" " --omit-header Çì´õ¿¡ `msgid \"\"' Ç׸ñÀ» ¾²Áö ¾Ê½À´Ï´Ù\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "¹ø¿ª ¸ñ·ÏÀ» ´Ù¸¥ ¹®ÀÚ ÀÎÄÚµùÀ¸·Î º¯È¯ÇÕ´Ï´Ù.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -816,8 +822,8 @@ msgstr "" " -t, --to-code=<À̸§> Ãâ·ÂÀÇ ÀÎÄÚµù\n" "±âº» ÀÎÄÚµùÀº ÇöÀç ·ÎÄÉÀÏÀÇ ÀÎÄÚµùÀÔ´Ï´Ù.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -828,6 +834,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -843,20 +851,20 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "Á¤È®È÷ ÇÑ °³ÀÇ ÀÔ·Â ÆÄÀÏÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] <ÀÔ·ÂÆÄÀÏ>\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -869,7 +877,7 @@ msgstr "" "¹ø¿ªµÇÁö ¾ÊÀº Ç׸ñÀº msgid¿Í µ¿ÀÏÇÑ ¹ø¿ª¹®ÀÌ ÇÒ´çµÉ °ÍÀÌ°í,\n" "ÆÛÁö·Î Ç¥½ÃµÉ °ÍÀÔ´Ï´Ù.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -915,7 +923,7 @@ msgstr "" "Ưº°È÷ ³»ºÎ ¸í·É¾î '0'Àº ¹ø¿ª¹®À» ±×´ë·Î Ãâ·ÂÇÏ°í, ¸Ç ³¡¿¡ 0 ³Î ¹ÙÀÌÆ®¸¦ \n" "Ãâ·ÂÇÕ´Ï´Ù. \"msgexec 0\"ÀÇ Ãâ·Â¹°Àº \"xargs -0\"ÀÇ ÀÔ·ÂÀ¸·Î »ç¿ëÇϱ⿡ ÀûÇÕÇÕ´Ï´Ù\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -932,30 +940,30 @@ msgstr "" msgid "write to stdout failed" msgstr "Ç¥ÁØ Ãâ·Â¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "ÇÊÅÍ À̸§ÀÌ ºüÁ³½À´Ï´Ù" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "ÃÖ¼ÒÇÑ ÇÑ °³ÀÇ sed ½ºÅ©¸³Æ®¸¦ ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] <ÇÊÅÍ> [<ÇÊÅÍ-¿É¼Ç>]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "¹ø¿ª ¸ñ·ÏÀÇ ¸ðµç ¹ø¿ª¹®¿¡ ´ëÇÏ¿© ÇÊÅ͸¦ Àû¿ëÇÕ´Ï´Ù.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -965,7 +973,7 @@ msgstr "" "Ãâ·ÂÇÏ´Â ÇÁ·Î±×·¥ÀÌ¸é ¾î¶² ÇÁ·Î±×·¥ÀÌµç °¡´ÉÇÕ´Ï´Ù.\n" # pattern space? -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -980,8 +988,8 @@ msgstr "" " Ãß°¡ÇÕ´Ï´Ù\n" " -n, --quiet, --silent ÆÐÅÏ °ø¹éÀ» ÀÚµ¿À¸·Î Ãâ·ÂÇÏÁö ¾Êµµ·Ï ÇÕ´Ï´Ù\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -993,6 +1001,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1009,22 +1019,22 @@ msgstr "" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡ ºñÂ÷´Ü ÀÔÃâ·ÂÀ» ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿ÍÀÇ Åë½Å¿¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "%s ¼­ºêÇÁ·Î¼¼½º¿¡¼­ ÀбⰡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d·Î(À¸·Î) ³¡³µ½À´Ï´Ù" @@ -1034,18 +1044,18 @@ msgstr "%s msgid "the argument to %s should be a single punctuation character" msgstr "%sÀÇ ÀÎÀÚ´Â ÇÑ °³ÀÇ ±¸µÎÁ¡ ¹®ÀÚ¿©¾ß ÇÕ´Ï´Ù" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%sÀº(´Â) \"-d µð·ºÅ丮\" ÁöÁ¤ÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%sÀº(´Â) \"-d ·ÎÄÉÀÏ\" ÁöÁ¤ÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%sÀº(´Â) %s°ú(¿Í) ÇÔ²² ½á¾ß¸¸ È¿°ú°¡ ÀÖ½À´Ï´Ù" @@ -1394,12 +1404,12 @@ msgstr " msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "'%c' ¿É¼ÇÀº 'K'³ª 'T'°¡ ÁöÁ¤µÇ±â Àü¿¡´Â ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1408,7 +1418,7 @@ msgstr "" "¹ø¿ª ¸ñ·Ï¿¡¼­ ÁÖ¾îÁø ÆÐÅÏ¿¡ ¸Â´Â ¸Þ¼¼Áö ȤÀº ÁÖ¾îÁø ¼Ò½º ÆÄÀÏ¿¡ µé¾î ÀÖ´Â\n" "¸Þ¼¼Áö¸¸À» »Ì¾Æ ³À´Ï´Ù.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1465,8 +1475,8 @@ msgstr "" " -f, --file=<ÆÄÀÏ> \"ÆÐÅÏ\"À» <ÆÄÀÏ>¿¡¼­ °¡Á®¿É´Ï´Ù\n" " -i, --ignore-case ´ë¼Ò¹®ÀÚ ±¸º°À» ÇÏÁö ¾Ê½À´Ï´Ù\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1477,6 +1487,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1492,11 +1504,11 @@ msgstr "" " --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" " --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "grep ¼­ºê ÇÁ·Î¼¼½º¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1506,7 +1518,7 @@ msgstr "" "¿©·¯ºÐÀÇ LANG ȯ°æº¯¼ö¸¦ ¼¼ÆÃÇϽʽÿÀ. ¼¼ÆÃÇؾ߸¸ÀÌ ¿©·¯ºÐÀÇ\n" "¹ø¿ª¹®À» Å×½ºÆ®ÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1517,12 +1529,12 @@ msgstr "" "--locale ¿É¼ÇÀ¸·Î ·ÎÄÉÀÏÀ» ÁöÁ¤Çϰųª --output-file ¿É¼ÇÀ¸·Î\n" "Ãâ·Â .po ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "%sÀ»(¸¦) ¸¸µé¾ú½À´Ï´Ù.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1531,7 +1543,7 @@ msgstr "" "»õ·Î¿î PO ÆÄÀÏÀ» ¸¸µé°í, »ç¿ëÀÚÀÇ È¯°æ¿¡¼­ ¸ÞŸ Á¤º¸µéÀ»\n" "ÃʱâÈ­ÇÕ´Ï´Ù\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1544,7 +1556,7 @@ msgstr "" "¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, ÇöÀç µð·ºÅ丮¿¡¼­ POT ÆÄÀÏÀ» ã½À´Ï´Ù.\n" "ÀÔ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1557,20 +1569,22 @@ msgstr "" "¸¸¾à Ãâ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾ÊÀ¸¸é, --locale ¿É¼ÇÀ̳ª »ç¿ëÀÚÀÇ ·ÎÄÉÀÏ ¼¼Æÿ¡\n" "µû¶ó °áÁ¤µË´Ï´Ù. Ãâ·Â ÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·Â¿¡ ¾¹´Ï´Ù.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Ãâ·Â ÁöÁ¤:\n" " -l, --locale=LL_CC ¸ñÇ¥ ·ÎÄÉÀÏÀ» ÁöÁ¤ÇÕ´Ï´Ù\n" " --no-translator PO ÆÄÀÏÀÌ ÀÚµ¿À¸·Î ¸¸µé¾î Áø´Ù°í °¡Á¤ÇÕ´Ï´Ù\n" " -w, --width=<Å©±â> Ãâ·Â ÆäÀÌÁö ÆøÀ» ¼³Á¤ÇÕ´Ï´Ù\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1578,11 +1592,11 @@ msgstr "" "µÎ °³ ÀÌ»óÀÇ .pot ÆÄÀÏÀ» ã¾Ò½À´Ï´Ù.\n" "ÀÔ·Â .pot ÆÄÀÏÀ» --input ¿É¼ÇÀ¸·Î ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "ÇöÀç µð·ºÅ丮¸¦ Àд µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1590,23 +1604,23 @@ msgstr "" "ÇöÀç µð·ºÅ丮¿¡¼­ .pot ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù.\n" "--input ¿É¼ÇÀ¸·Î ÀÔ·Â .pot ÆÄÀÏÀ» ÁöÁ¤ÇϽʽÿÀ.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen()ÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s ¼­ºêÇÁ·Î¼¼½º ÀÔÃâ·Â ¿À·ù" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s ¼­ºêÇÁ·Î¼¼½º°¡ Á¾·áÄÚµå %d·Î(À¸·Î) ½ÇÆÐÇß½À´Ï´Ù" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1622,7 +1636,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "%s ÆÐÅ°Áö¿¡ ´ëÇÑ Çѱ¹¾î ¹ø¿ª¹®" @@ -1658,7 +1672,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "¸ñÇ¥ ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "°æ°í: " @@ -1762,11 +1776,11 @@ msgstr "" "¸¸,\n" "ÀÌ ¹öÀüÀº iconv()¸¦ Áö¿øµÇÁö ¾Ê´Â »óÅ·ΠºôµåµÇ¾ú½À´Ï´Ù." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "¹é¾÷ Á¾·ù" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1789,7 +1803,7 @@ msgstr "" "º¸Á¸µË´Ï´Ù. Á¤È®ÇÑ Â¦À» ãÁö ¸øÇÒ °æ¿ì, º¸´Ù ³ªÀº °á°ú¸¦ ¾ò±â À§ÇØ ÆÛÁö \n" "¸ÅĪÀÌ »ç¿ëµË´Ï´Ù.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1806,7 +1820,7 @@ msgstr "" " -C, --compendium=<ÆÄÀÏ> ¸Þ¼¼Áö ¹ø¿ª ¶óÀ̺귯¸® Ãß°¡,\n" " µÎ °³ ÀÌ»ó ÁöÁ¤ÇÒ ¼ö ÀÖ½À´Ï´Ù\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1817,7 +1831,7 @@ msgstr "" " -U, --update def.po¸¦ °»½ÅÇÕ´Ï´Ù,\n" " ÀÌ¹Ì def.po°¡ °»½ÅµÇ¾î ÀÖ´Ù¸é ¾Æ¹« °Íµµ ¾È ÇÕ´Ï´Ù\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1846,7 +1860,7 @@ msgstr "" "--suffix³ª SIMPLE_BACKUP_SUFFIX ȯ°æ º¯¼ö¸¦ ¼¼ÆÃÇÏÁö ¾Ê¾Ò´Ù¸é, ¹é¾÷\n" "Á¢¹Ì¾î´Â `~'ÀÔ´Ï´Ù.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1861,15 +1875,15 @@ msgstr "" " -v, --verbose ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n" " -q, --quiet, --silent ÁøÇà»óÅ ǥ½Ã¸¦ ÇÏÁö ¾Ê½À´Ï´Ù\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؾ߸¸ ÇÕ´Ï´Ù" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "ÀÌ ¸Þ½ÃÁö´Â º¹¼öÇüÀ» ÁöÁ¤Çؼ­´Â ¾È µË´Ï´Ù" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1878,26 +1892,26 @@ msgstr "" "%s%ld°³ÀÇ ¿¹Àü °Í + %ld°³ÀÇ ÂüÁ¶¹®, °áÇÕµÈ °Í %ld, ÆÛÁö %ld, ºüÁø °Í %ld, ¾µ" "¸ð¾ø´Â °Í %ld°³¸¦ Àоú½À´Ï´Ù.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " ¿Ï·á.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s°ú(¿Í) ÆÄÀÏÀ̸§À» ¸í½ÃÀûÀ¸·Î ÁöÁ¤ÇÏ´Â °ÍÀº µ¿½Ã¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "»ç¿ë¹ý: %s [<¿É¼Ç>] [<ÆÄÀÏ>]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "ÀÌÁø ¸Þ¼¼Áö ¸ñ·ÏÀ» Uniforum ½ºÅ¸ÀÏ .po ÆÄÀÏ·Î º¯È¯ÇÕ´Ï´Ù.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1908,7 +1922,7 @@ msgstr "" " -j, --java ÀÚ¹Ù ¸ðµå: ÀÔ·ÂÀº ÀÚ¹Ù ResourceBundle Ŭ·¡½ºÀÔ´Ï´Ù\n" " --tcl Tcl ¸ðµå: ÀÔ·ÂÀº tcl/msgcat .msg ÆÄÀÏÀÔ´Ï´Ù\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1919,7 +1933,7 @@ msgstr "" " ÆÄÀÏ ... ÀÔ·Â .mo ÆÄÀÏ\n" "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê°Å³ª \"-\"À̸é, Ç¥ÁØ ÀԷ¿¡¼­ ÀнÀ´Ï´Ù.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1934,7 +1948,7 @@ msgstr "" "Ŭ·¡½º À̸§Àº ·ÎÄÉÀÏ À̸§¿¡ ¸®¼Ò½º À̸§À» ¹ØÁÙ·Î ±¸ºÐÇؼ­ ¿¬°áÇÑ À̸§À¸·Î\n" "°áÁ¤µË´Ï´Ù. Ŭ·¡½º´Â CLASSPATH¿¡ µû¸¥ À§Ä¡¿¡ ³õÀÌ°Ô µË´Ï´Ù.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1949,7 +1963,7 @@ msgstr "" "-l ¿É¼Ç°ú -d ¿É¼ÇÀº ²À ÇÊ¿äÇÕ´Ï´Ù. Ŭ·¡½º´Â ÁöÁ¤ÇÑ µð·ºÅ丮\n" "¾Æ·¡¿¡ Ãâ·ÂµË´Ï´Ù.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1962,8 +1976,8 @@ msgstr "" "Ãâ·Â ÆÄÀÏÀÌ ÁöÁ¤µÇÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, °á°ú¹°À» Ç¥ÁØ Ãâ·Â¿¡\n" "¾¹´Ï´Ù.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1972,6 +1986,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Ãâ·Â ÁöÁ¤:\n" @@ -1983,7 +1999,7 @@ msgstr "" " -w, --width=<Å©±â> Ãâ·Â ÆäÀÌÁö ÆøÀ» ¼³Á¤ÇÕ´Ï´Ù\n" " -s, --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1996,7 +2012,7 @@ msgstr "" " -V, --version ¹öÀü Á¤º¸¸¦ Ç¥½ÃÇÏ°í Á¾·áÇÕ´Ï´Ù\\n\"\n" " -v, --verbose ´õ ÀÚ¼¼È÷ Ãâ·ÂÇÕ´Ï´Ù\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2017,7 +2033,7 @@ msgstr "" "¹ø¿ª¹®¿¡ ÀÖ´Â °Í¸¸À» ¾²°Ô µË´Ï´Ù. ÆÄÀÏÀÇ À§Ä¡´Â ¸ðµÎ À¯ÁöµÉ °ÍÀÔ´Ï´Ù.\n" "--unique ¿É¼ÇÀ» »ç¿ëÇÒ ¶§, Áߺ¹µÈ ¸Þ¼¼ÁöµéÀ» ¹ö¸³´Ï´Ù.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2174,7 +2190,7 @@ msgstr " msgid "too many errors, aborting" msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Áß´ÜÇÕ´Ï´Ù" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "À߸øµÈ °¡º¯¹ÙÀÌÆ® ¹®ÀÚ¿­" @@ -2275,7 +2291,7 @@ msgstr " msgid "failed to create \"%s\"" msgstr "\"%s\"À»(¸¦) ¸¸µå´Â µ¥ ½ÇÆÐÇß½À´Ï´Ù" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" ÆÄÀÏÀ» ¾²´Â µ¿¾È ¿À·ù ¹ß»ý" @@ -2291,13 +2307,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "¾²±â À§ÇØ \"%s\"À»(¸¦) ¿©´Â µ¿¾È ¿À·ù ¹ß»ý" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "±¹Á¦È­µÈ ¸Þ½ÃÁö´Â `\\%c' À̽ºÄÉÀÌÇÁ ¼ø¼­¿­À» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2310,12 +2326,12 @@ msgstr "" "¹ß»ýÇÒ ¼ö ÀÖ½À´Ï´Ù. ¼ø¼öÇÑ ASCII msgid¸¸À» »ç¿ëÇϵµ·Ï ÇϽʽÿÀ.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "Ãâ·Â ÆÄÀÏ \"%s\"À»(¸¦) ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "Ç¥ÁØ Ãâ·Â" @@ -2330,7 +2346,7 @@ msgstr "%s:%d: msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "ÀÌ ÆÄÀÏÀº µµ¸ÞÀÎ Áö½ÃÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù" @@ -2349,25 +2365,25 @@ msgstr "%s:%d: # msgid "%s:%d: invalid string expression" msgstr "%s:%d: À߸øµÈ ¹®ÀÚ¿­ Ç¥Çö" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-exeistingÀº Ãâ·ÂÀÌ Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áú ¶§ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext´Â °Ë»öÇÒ Å°¿öµå ¾øÀÌ´Â µ¿ÀÛÇÏÁö ¾Ê½À´Ï´Ù" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "ÁÖ¾îÁø ÀÔ·Â ÆÄÀÏ¿¡¼­ ¹ø¿ª °¡´ÉÇÑ ¹®ÀÚ¿­À» »Ì¾Æ³À´Ï´Ù.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2376,7 +2392,7 @@ msgstr "" "±ä ¿É¼Ç¿¡¼­ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n" "¾ø¾îµµ µÇ´Â ÀÎÀÚµµ ¸¶Âù°¡ÁöÀÔ´Ï´Ù.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2391,7 +2407,7 @@ msgstr "" " -p, --output-dir=<µð·ºÅ丮> Ãâ·Â ÆÄÀÏÀ» <µð·ºÅ丮> µð·ºÅ丮¿¡ ³õ½À´Ï´Ù\n" "Ãâ·ÂÆÄÀÏÀÌ \"-\"À̸é, Ç¥ÁØ Ãâ·ÂÀ¸·Î Ãâ·ÂÇÕ´Ï´Ù.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2411,7 +2427,7 @@ msgstr "" "±âº»ÀûÀ¸·Î ÀÔ·Â ÆÄÀÏÀÇ È®ÀåÀÚ¿¡ µû¶ó ¾ð¾î¸¦ ÃßÃøÇÕ´Ï´Ù\n" # TAG°¡ Á¤È®ÀÌ ¹¹Áö? -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2426,7 +2442,7 @@ msgstr "" " -c, --add-comments[=<ű×>] ÁÖ¼® ºÎºÐÀ» <ÅÂÅ©>·Î (ȤÀº Å°¿öµå ÁÙ ¾Õ¿¡\n" " ÀÖ´Â °ÍÀ¸·Î) ¾¹´Ï´Ù\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2443,8 +2459,8 @@ msgstr "" " -T, --trigraphs ÀԷ¿¡¼­ ANSI C »ïÁßÀÚ(trigraph)¸¦ ÀνÄÇÕ´Ï´Ù\n" " --debug ´õ ÀÚ¼¼ÇÑ Çü½Ä¹®ÀÚ¿­ ÀÎ½Ä °á°ú\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2455,6 +2471,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2480,11 +2498,11 @@ msgstr "" " -m, --msgstr-prefix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢µÎ¾î·Î\n" " -M, --msgstr-suffix[=<¹®ÀÚ¿­>] msgstr Ç׸ñ¿¡ <¹®ÀÚ¿­> ȤÀº \"\"À» Á¢¹Ì¾î·Î\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "Ç¥ÁØ ÀÔ·Â" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2494,7 +2512,7 @@ msgstr "" "gettext(\"\")´Â ºó ¹®ÀÚ¿­ÀÌ ¾Æ´Ï¶ó, ¸ÞŸ Á¤º¸°¡ µé¾î ÀÖ´Â \n" "Çì´õ Ç׸ñÀ» ¸®ÅÏÇÕ´Ï´Ù.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "`%s' ¾ð¾î¸¦ ¾Ë ¼ö ¾øÀ½" diff --git a/po/nl.gmo b/po/nl.gmo index 69260788a..433977445 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 0073afaf3..ede359d12 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.31\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 1997-03-11 22:38 \n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fout tijdens openen om te lezen van \"%s\"" @@ -235,11 +235,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "formaat specificaties voor argument %u zijn niet dezelfde" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -251,16 +251,16 @@ msgstr "" "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n" "SPECIFIEK DOEL.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Geschreven door %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "te veel argumenten" @@ -268,11 +268,11 @@ msgstr "te veel argumenten" msgid "missing arguments" msgstr "ontbrekende argumenten" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" @@ -333,16 +333,16 @@ msgstr "" "worden de in de katalogus gevonden meldingen vertaald.\n" "Standaard zoek directory: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Meld fouten via .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -362,9 +362,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -376,43 +376,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s en %s zijn mutually exclusive" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -421,8 +421,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -431,7 +431,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -443,7 +443,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -455,7 +455,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -467,6 +467,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -487,17 +489,17 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -511,7 +513,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -521,7 +523,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -530,7 +532,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -543,7 +545,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -558,6 +560,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -578,7 +582,7 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -586,15 +590,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "geen invoerbestanden gegeven" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "precies 2 invoerbestanden zijn benodigd" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -633,22 +637,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "deze melding is gebruikt maar is niet gedefinieerd..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...maar de definitie is gelijksoortig" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" @@ -671,11 +675,11 @@ msgstr "dubbele melding definitie" msgid "...this is the location of the first definition" msgstr "...dit is de lokatie van de eerste definitie" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -688,7 +692,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -701,7 +705,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -713,6 +717,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -734,12 +740,12 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -747,7 +753,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -759,6 +765,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -779,21 +787,21 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "geen invoerbestand gegeven" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "precies 2 invoerbestanden zijn benodigd" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -802,7 +810,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -838,7 +846,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -851,38 +859,38 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "ontbrekende argumenten" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -892,7 +900,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -905,6 +913,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -925,22 +935,22 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -950,18 +960,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1272,19 +1282,19 @@ msgstr "lege `msgstr' ingang genegeerd" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: let op: broncode bevat vage vertaling" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1315,7 +1325,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1327,6 +1337,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1347,18 +1359,18 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1366,19 +1378,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1387,7 +1399,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1396,48 +1408,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1449,7 +1463,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1483,7 +1497,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1563,11 +1577,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1592,7 +1606,7 @@ msgstr "" "worden om betere resultaten te verkrijgen. De resultaten worden naar \n" "standaarduitvoer geschreven tenzij een uitvoerbestand is gespecificeerd.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1603,7 +1617,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1611,7 +1625,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1628,7 +1642,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1638,17 +1652,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "deze melding is gebruikt maar niet gedefinieerd in %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1657,26 +1671,26 @@ msgstr "" "%sLees %d oud + %d referentie, samengevoegd %d, fuzzied(gevaagd) %d, " "ontbrekend %d, overbodig %d.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " done.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s en %s zijn mutually exclusive" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1684,7 +1698,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1692,7 +1706,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1702,7 +1716,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1712,7 +1726,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1721,7 +1735,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1731,6 +1745,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Gebruik: %s [OPTIE] [BESTAND]...\n" @@ -1747,7 +1763,7 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -w, --width=NUMMER stel uitvoer paginabreedte in\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1756,7 +1772,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1769,7 +1785,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1918,7 +1934,7 @@ msgstr "" msgid "too many errors, aborting" msgstr "te veel fouten, afgebroken" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 #, fuzzy msgid "invalid multibyte sequence" msgstr "illegale kontrol sequence" @@ -2023,7 +2039,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "fout bij schrijven bestand \"%s\"" @@ -2037,14 +2053,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "fout bij openen om te schrijven van \"%s\"" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2053,12 +2069,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan uitvoerbestand \"%s\" niet aanmaken" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standaard uitvoer" @@ -2073,7 +2089,7 @@ msgstr "%s:%d: let op: niet getermineerde karakter konstante" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: let op: niet getermineerde string literal" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "dit bestand mag geen domein directives bevatten" @@ -2092,35 +2108,35 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan niet gebruikt worden indien uitvoer naar " "standaarduitvoer\n" "wordt geschreven" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "let op: bestand `%s' extensie `%s' is onbekend; ga C proberen" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2130,7 +2146,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2142,7 +2158,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2152,7 +2168,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2163,7 +2179,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2175,6 +2191,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2200,18 +2218,18 @@ msgstr "" " -V, --version toon versie-informatie en bekindig programma\n" " -W, --width=NUMBER stel uitvoer pagina breedte in\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standaard invoer" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "taal `%s' onbekend" diff --git a/po/nn.gmo b/po/nn.gmo index be462af8e..36c5ee5b1 100644 Binary files a/po/nn.gmo and b/po/nn.gmo differ diff --git a/po/nn.po b/po/nn.po index 858150651..de351e32e 100644 --- a/po/nn.po +++ b/po/nn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.12\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 1996-03-21 08:46 EST\n" "Last-Translator: Karl Anders Øygard \n" "Language-Team: Norwegian-nynorsk \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, fuzzy, c-format msgid "error while opening \"%s\" for reading" msgstr "feil under skriving av fila \"%s\"" @@ -238,11 +238,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "format-spesifiseringane for argument %u er ulike" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,16 +250,16 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 #, fuzzy msgid "too many arguments" msgstr "manglar argument" @@ -268,11 +268,11 @@ msgstr "manglar argument" msgid "missing arguments" msgstr "manglar argument" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, fuzzy, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for meir informasjon\n" @@ -333,15 +333,15 @@ msgstr "" "staden vert meldingar som er funne i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -361,9 +361,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -375,43 +375,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s utelukker kvarandre" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -420,8 +420,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -430,7 +430,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -442,7 +442,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -454,7 +454,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -466,6 +466,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -479,17 +481,17 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -503,7 +505,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -513,7 +515,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -522,7 +524,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -535,7 +537,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -550,6 +552,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -563,7 +567,7 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -571,16 +575,16 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 #, fuzzy msgid "no input files given" msgstr "inga innfil spesifisert" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "treng nøyaktig to innfiler" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -616,22 +620,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "denne meldinga er brukt, men ikkje definert..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "... men denne definisjonen liknar" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "denne meldinga er brukt, men ikkje definert i %s" @@ -655,11 +659,11 @@ msgstr "" msgid "...this is the location of the first definition" msgstr "den første definisjonen finst her" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -672,7 +676,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -685,7 +689,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -697,6 +701,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -711,12 +717,12 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -724,7 +730,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -736,6 +742,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -749,21 +757,21 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "inga innfil spesifisert" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "treng nøyaktig to innfiler" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -772,7 +780,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -808,7 +816,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -821,38 +829,38 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "manglar argument" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -862,7 +870,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -875,6 +883,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -888,22 +898,22 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -913,18 +923,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1234,19 +1244,19 @@ msgstr "" msgid "%s: warning: source file contains fuzzy translation" msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1277,7 +1287,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1289,6 +1299,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1302,18 +1314,18 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1321,19 +1333,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1342,7 +1354,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1351,48 +1363,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1404,7 +1418,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1438,7 +1452,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1518,11 +1532,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1547,7 +1561,7 @@ msgstr "" "resultat. Resultatet vert skrive til standard ut, med mindre ei utfil er\n" "spesifisert.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1558,7 +1572,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1566,7 +1580,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1583,7 +1597,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1593,17 +1607,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "denne meldinga er brukt, men ikkje definert i %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1612,26 +1626,26 @@ msgstr "" "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n" "utdaterte %d.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr "" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og %s utelukker kvarandre" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1639,7 +1653,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1647,7 +1661,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1657,7 +1671,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1667,7 +1681,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1676,7 +1690,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1686,6 +1700,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Usage: %s [OPTION] [FILE]...\n" @@ -1698,7 +1714,7 @@ msgstr "" " --strict write strict uniforum style\n" " -V, --version output version information and exit\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1707,7 +1723,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1720,7 +1736,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1869,7 +1885,7 @@ msgstr "" msgid "too many errors, aborting" msgstr "for mange feil, avsluttar" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "" @@ -1970,7 +1986,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "feil under skriving av fila \"%s\"" @@ -1984,14 +2000,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "feil under skriving av fila \"%s\"" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2000,12 +2016,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikkje opprette utfila \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "" @@ -2020,7 +2036,7 @@ msgstr "" msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "denne fila kan ikkje innehalde domene-nøkkelord" @@ -2039,33 +2055,33 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2075,7 +2091,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2087,7 +2103,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2097,7 +2113,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2108,7 +2124,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2120,6 +2136,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2138,18 +2156,18 @@ msgstr "" " --strict lag strengt Uniforum-konformt utdata\n" " -V, --version vis programversjon og avslutt\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "" diff --git a/po/no.gmo b/po/no.gmo index 5facaf446..20066348f 100644 Binary files a/po/no.gmo and b/po/no.gmo differ diff --git a/po/no.po b/po/no.po index eab2b6c3e..c273d0060 100644 --- a/po/no.po +++ b/po/no.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.37\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-05-09 02:08+02:00\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian-bokmål \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "feil under åpning av «%s» for lesing" @@ -236,11 +236,11 @@ msgstr "format-spesifiseringene for argument %lu er ulike" # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med? # Er denne oversettelsen grei nok? -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -252,16 +252,16 @@ msgstr "" "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT\n" "FORMÅL.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Skrevet av %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "for mange argumenter" @@ -269,11 +269,11 @@ msgstr "for mange argumenter" msgid "missing arguments" msgstr "mangler argumenter" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv «%s --help» for mer informasjon.\n" @@ -334,16 +334,16 @@ msgstr "" "stedet blir funne meldinger i den valgte katalogen oversatt.\n" "Standard søkekatalog er: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Rapporter feil til .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -363,9 +363,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -377,43 +377,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s og %s utelukker hverandre" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -422,8 +422,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -432,7 +432,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -444,7 +444,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -456,7 +456,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -468,6 +468,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -489,17 +491,17 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "umulig utvalgskriterie angitt (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -529,7 +531,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -539,7 +541,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -548,7 +550,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -577,7 +579,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -592,6 +594,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -613,7 +617,7 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -621,15 +625,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ingen innfiler angitt" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "trenger nøyaktig to innfiler" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -666,22 +670,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "denne meldingen er brukt, men ikke definert..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "... men denne definisjonen ligner" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "denne meldingen er brukt, men ikke definert i %s" @@ -705,11 +709,11 @@ msgstr "duplisert definisjon av melding" msgid "...this is the location of the first definition" msgstr "... dette er lokasjonen til den første definisjonen" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "minst to filer må angis" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -738,7 +742,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -767,7 +771,7 @@ msgstr "" "PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n" "bli bevart.\n" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -779,6 +783,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -801,12 +807,12 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -814,7 +820,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -826,6 +832,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -847,21 +855,21 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "ingen innfil angitt" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "trenger nøyaktig to innfiler" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -870,7 +878,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -906,7 +914,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -919,39 +927,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "mangler argumenter" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "minst to filer må angis" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -961,7 +969,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -974,6 +982,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -995,22 +1005,22 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1020,18 +1030,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1347,19 +1357,19 @@ msgstr "antatt msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: advarselL: kildefil har antatte oversettelser" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1390,7 +1400,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1402,6 +1412,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1423,18 +1435,18 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1442,19 +1454,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1463,7 +1475,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1472,48 +1484,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1525,7 +1539,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1559,7 +1573,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 #, fuzzy msgid "warning: " msgstr "%s: advarsel: " @@ -1644,11 +1658,11 @@ msgstr "" "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n" "Denne versjonen ble blygget uten iconv().\n" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1673,7 +1687,7 @@ msgstr "" "resultater. Resultatet blir skrevet til standard ut, med mindre en utfil\n" "er spesifisert.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1684,7 +1698,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1692,7 +1706,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1709,7 +1723,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1719,17 +1733,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "denne meldingen er brukt, men ikke definert i %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "denne meldingen er brukt, men ikke definert i %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1738,26 +1752,26 @@ msgstr "" "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, " "foreldete %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " ferdig.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s og %s utelukker hverandre" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1765,7 +1779,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1773,7 +1787,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1783,7 +1797,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1793,7 +1807,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1802,7 +1816,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1812,6 +1826,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Bruksmåte: %s [FLAGG] [FIL]...\n" @@ -1826,7 +1842,7 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1835,7 +1851,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1848,7 +1864,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2001,7 +2017,7 @@ msgstr "flertallsform har feil indeks" msgid "too many errors, aborting" msgstr "for mange feil, avbryter" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "ulovlig multibytesekvens" @@ -2104,7 +2120,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "feil under skriving av filen «%s»" @@ -2118,14 +2134,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "feil under åpning av «%s» for skriving" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2134,12 +2150,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan ikke opprette utfilen «%s»" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard ut" @@ -2154,7 +2170,7 @@ msgstr "%s:%d: advarsel: uavsluttet tegnkonstant" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: advarsel: uavsluttet strengliteral" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "denne filen kan ikke inneholde domene-direktiver" @@ -2173,33 +2189,33 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan ikke brukes når utdata blir skrevet til standard ut" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext kan ikke arbeide uten å finne nøkkelord" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2209,7 +2225,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2221,7 +2237,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2231,7 +2247,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2242,7 +2258,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2254,6 +2270,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2280,18 +2298,18 @@ msgstr "" " -V, --version skriv ut programversjon og avslutt\n" " -w, --width=ANTALL sett sidebredden i utdata\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard inn" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "språket «%s» er ukjent" diff --git a/po/pl.gmo b/po/pl.gmo index e34a308a9..b8989bfda 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 6faa70704..adf8c3fe8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.39\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-08-01 23:50+0200\n" "Last-Translator: Rafa³ Maszkowski \n" "Language-Team: Polish \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "b³±d w czasie otwierania \"%s\" do czytania" @@ -236,11 +236,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -252,16 +252,16 @@ msgstr "" "Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji MO¯LIWO¦CI\n" "SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Zapisane przez %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "za du¿o argumentów" @@ -269,11 +269,11 @@ msgstr "za du msgid "missing arguments" msgstr "brakuj±ce argumenty" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n" @@ -334,16 +334,16 @@ msgstr "" "wybranym katalogu.\n" "Domy¶lnie przeszukiwany katalog: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -363,9 +363,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -377,43 +377,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s i %s wzajemnie siê wykluczaj±" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -422,8 +422,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -432,7 +432,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -444,7 +444,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -456,7 +456,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -468,6 +468,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -489,17 +491,17 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -527,7 +529,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -537,7 +539,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -546,7 +548,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -573,7 +575,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -588,6 +590,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -609,7 +613,7 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -617,15 +621,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "nie podano nazw plików wej¶ciowych" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -662,22 +666,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ale ta definicja jest podobna" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" @@ -702,11 +706,11 @@ msgstr "podw msgid "...this is the location of the first definition" msgstr "...to jest po³o¿enie pierwszej definicji" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "musz± byæ podane przynajmniej dwa pliki" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -733,7 +737,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -760,7 +764,7 @@ msgstr "" "ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n" "wszystkich plików PO te¿ zostan± zachowane.\n" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -772,6 +776,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -794,12 +800,12 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -807,7 +813,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -819,6 +825,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -840,21 +848,21 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "nie podano nazwy pliku wej¶ciowego" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -863,7 +871,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -899,7 +907,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -912,39 +920,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "brakuj±ce argumenty" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "musz± byæ podane przynajmniej dwa pliki" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -954,7 +962,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -967,6 +975,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -988,22 +998,22 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1013,18 +1023,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1345,19 +1355,19 @@ msgstr "zignorowana niepewna (fuzzy) warto msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1388,7 +1398,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1400,6 +1410,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1421,18 +1433,18 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1440,19 +1452,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1461,7 +1473,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1470,48 +1482,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1523,7 +1537,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1557,7 +1571,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 #, fuzzy msgid "warning: " msgstr "%s: ostrze¿enie: " @@ -1642,11 +1656,11 @@ msgstr "" "Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n" "Ta wersja zosta³a skompilowana bez iconv().\n" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1670,7 +1684,7 @@ msgstr "" "dok³adnie u¿ywane jest porównanie rozmyte, dla lepszych wyników. Wyniki s±\n" "pisane na standardowe wyj¶cie je¿eli plik wyj¶iowy nie jest podany.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1681,7 +1695,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1689,7 +1703,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1706,7 +1720,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1716,17 +1730,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1735,26 +1749,26 @@ msgstr "" "%sPrzeczytane %ld starych + %ld odno¶ników, %ld do³±czonych, %ld " "niedok³adnych, %ld brakuj±cych, %ld przestarza³ych.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " zrobione.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s i %s wzajemnie siê wykluczaj±" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1762,7 +1776,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1770,7 +1784,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1780,7 +1794,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1790,7 +1804,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1799,7 +1813,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1809,6 +1823,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Sk³adnia: %s [OPCJA] def.po ref.po\n" @@ -1823,7 +1839,7 @@ msgstr "" " -V, --version wy¶wietl informacjê o wersji i zakoñcz\n" " -w, --width=LICZBA ustal szeroko¶æ strony\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1832,7 +1848,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1845,7 +1861,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1999,7 +2015,7 @@ msgstr "forma mnoga ma z msgid "too many errors, aborting" msgstr "%s: za du¿o b³êdów, przerwanie wykonywania" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "b³êdna sekwencja wielobajtowa" @@ -2103,7 +2119,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "b³±d podczas pisania do pliku \"%s\"" @@ -2117,13 +2133,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "b³±d otwarcia \"%s\" do pisania" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2132,12 +2148,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standardowe wyj¶cie" @@ -2152,7 +2168,7 @@ msgstr "%s:%d: uwaga: niezako msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen" @@ -2171,32 +2187,32 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "--join-existing nie mo¿e byæ u¿yte kiedy wyniki" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext nie mo¿e dzia³aæ bez podania s³ów kluczowych" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "uwaga: typ pliku `%s' z rozszerzeniem `%s' jest nieznany; spróbujê C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2206,7 +2222,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2218,7 +2234,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2228,7 +2244,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2239,7 +2255,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2251,6 +2267,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2277,18 +2295,18 @@ msgstr "" " -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n" " -w, --width=LICZBA ustalenie szeroko¶ci strony\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "wej¶cie standardowe" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "nieznany jêzyk `%s'" diff --git a/po/pt.gmo b/po/pt.gmo index 2084c55ad..a3abe74d4 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 756b45cdf..6063bcff7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.23\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 1996-09-18 20:51 WET DST\n" "Last-Translator: Nuno Oliveira \n" "Language-Team: Portuguese \n" @@ -28,7 +28,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro durante a abertura de \"%s\" para leitura" @@ -234,11 +234,11 @@ 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -246,16 +246,16 @@ msgid "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "demasiados argumentos" @@ -263,11 +263,11 @@ msgstr "demasiados argumentos" msgid "missing arguments" msgstr "argumentos insuficientes" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, fuzzy, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para mais informação\n" @@ -329,15 +329,15 @@ msgstr "" "são traduzidas.\n" "Directório standard de pesquisa: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -357,9 +357,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -371,43 +371,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s são mutuamente exclusivas" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -416,8 +416,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -426,7 +426,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -438,7 +438,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -450,7 +450,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -462,6 +462,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -482,17 +484,17 @@ 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/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -506,7 +508,7 @@ msgid "" "File positions from all PO files will be cumulated.\n" msgstr "" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -516,7 +518,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -525,7 +527,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -538,7 +540,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcat.c:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -553,6 +555,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -573,7 +577,7 @@ 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/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -581,15 +585,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ficheiros de entrada não fornecidos" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "são necessários exactamente 2 ficheiros" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -630,22 +634,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "esta mensagem é usada mas não definida..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...mas esta definição é semelhante" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensagem é usada mas não definida em %s" @@ -668,11 +672,11 @@ msgstr "defini msgid "...this is the location of the first definition" msgstr "...este é o local da primeira definição" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -685,7 +689,7 @@ msgid "" "cumulated.\n" msgstr "" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -698,7 +702,7 @@ msgid "" " that only unique messages be printed\n" msgstr "" -#: src/msgcomm.c:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -710,6 +714,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -731,12 +737,12 @@ 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/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -744,7 +750,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -756,6 +762,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -776,21 +784,21 @@ 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/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "nenhum ficheiro de entrada fornecido" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "são necessários exactamente 2 ficheiros" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -799,7 +807,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -835,7 +843,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -848,38 +856,38 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "argumentos insuficientes" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -889,7 +897,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -902,6 +910,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -922,22 +932,22 @@ 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/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -947,18 +957,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1272,19 +1282,19 @@ msgstr "elemento `msgstr' vazio ignorada" msgid "%s: warning: source file contains fuzzy translation" msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1315,7 +1325,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1327,6 +1337,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1347,18 +1359,18 @@ 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/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1366,19 +1378,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1387,7 +1399,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1396,48 +1408,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1449,7 +1463,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1483,7 +1497,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1563,11 +1577,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1594,7 +1608,7 @@ msgstr "" "resultados serão escritos no canal de saída por defeito (stdout) a\n" "menos que seja especificado um ficheiro de saída.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1605,7 +1619,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1613,7 +1627,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1630,7 +1644,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1640,17 +1654,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, fuzzy, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1659,26 +1673,26 @@ msgstr "" "%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %" "d, obsoletas %d.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr "terminado.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s são mutuamente exclusivas" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1686,7 +1700,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1694,7 +1708,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1704,7 +1718,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1714,7 +1728,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1723,7 +1737,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1733,6 +1747,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Utilização: %s [OPÇÃO] [FICHEIRO]...\n" @@ -1750,7 +1766,7 @@ 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/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1759,7 +1775,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1772,7 +1788,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1922,7 +1938,7 @@ msgstr "" msgid "too many errors, aborting" msgstr "demasiados erros, interrompendo" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 #, fuzzy msgid "invalid multibyte sequence" msgstr "sequência de controlo ilegal" @@ -2027,7 +2043,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "erro durante a escrita do ficheiro \"%s\"" @@ -2041,7 +2057,7 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "erro durante a abertura de \"%s\" para escrita" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" @@ -2049,7 +2065,7 @@ msgstr "" "as mensagens de internacionalização não devem conter\n" "a sequência de escape `\\%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2058,12 +2074,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "impossível criar o ficheiro de saída \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "canal de saída por defeito (stdout)" @@ -2078,7 +2094,7 @@ msgstr "" msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "este ficheiro não pode conter directivas de domínio" @@ -2097,36 +2113,36 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2136,7 +2152,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2148,7 +2164,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2158,7 +2174,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2169,7 +2185,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2181,6 +2197,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2206,18 +2224,18 @@ 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/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrada standard" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index d2157b7d5..e133eaafb 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 882685d16..de1f6e865 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.10.36\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2001-04-03 08:25+02:00\n" "Last-Translator: Flávio Bruno Leitner \n" "Language-Team: Brazilian Portuguese \n" @@ -31,7 +31,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro ao abrir \"%s\" para leitura" @@ -240,11 +240,11 @@ 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,16 +255,16 @@ msgstr "" "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/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "excesso de parâmetros" @@ -272,11 +272,11 @@ msgstr "excesso de par msgid "missing arguments" msgstr "parâmetros não informados" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente `%s --help' para maiores informações\n" @@ -337,16 +337,16 @@ msgstr "" "mensagens encontradas no catálogo selecionado\n" "Diretório de pesquisa padrão: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 #, fuzzy msgid "Report bugs to .\n" msgstr "Reporte bugs para .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "" @@ -366,9 +366,9 @@ msgid "" " -i, --ip-address addresses for the hostname\n" msgstr "" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -380,43 +380,43 @@ msgstr "" msgid "could not get host name" msgstr "" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s são mutuamente exclusivos" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -425,8 +425,8 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -435,7 +435,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -447,7 +447,7 @@ msgid "" " --only-obsolete keep obsolete #~ messages\n" msgstr "" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -459,7 +459,7 @@ msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" msgstr "" -#: src/msgattrib.c:381 +#: src/msgattrib.c:386 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -471,6 +471,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -489,17 +491,17 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, 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:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, fuzzy, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -529,7 +531,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -539,7 +541,7 @@ msgid "" "If input file is -, standard input is read.\n" msgstr "" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -548,7 +550,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -577,7 +579,7 @@ 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:347 src/msguniq.c:319 +#: src/msgcat.c:352 src/msguniq.c:324 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -592,6 +594,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -610,7 +614,7 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -618,15 +622,15 @@ msgid "" " -V, --version output version information and exit\n" msgstr "" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "arquivos de entrada não informados" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "são necessários 2 arquivos de entrada" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "" @@ -665,22 +669,22 @@ msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" msgstr "" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" " -m, --multi-domain apply ref.pot to each of the domains in def.po\n" msgstr "" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "esta mensagem é utilizada, mas não foi definida..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...mas esta definição é similar" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensagem é utilizada mas não definida em %s" @@ -704,11 +708,11 @@ msgstr "defini msgid "...this is the location of the first definition" msgstr "...esta é a localização da primeira definição" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "pelo menos dois arquivos devem ser especificados" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, fuzzy, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -737,7 +741,7 @@ 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:350 +#: src/msgcomm.c:355 #, fuzzy, no-wrap msgid "" "Message selection:\n" @@ -766,7 +770,7 @@ 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:362 +#: src/msgcomm.c:367 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -778,6 +782,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -797,12 +803,12 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -810,7 +816,7 @@ msgid "" "The default encoding is the current locale's encoding.\n" msgstr "" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -822,6 +828,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -840,21 +848,21 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "não foi informado o arquivo de entrada" -#: src/msgen.c:191 +#: src/msgen.c:197 #, fuzzy msgid "exactly one input file required" msgstr "são necessários 2 arquivos de entrada" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -863,7 +871,7 @@ msgid "" "identical to the msgid, and are marked fuzzy.\n" msgstr "" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -899,7 +907,7 @@ msgid "" "null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n" msgstr "" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -912,39 +920,39 @@ msgstr "" msgid "write to stdout failed" msgstr "" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 #, fuzzy msgid "missing filter name" msgstr "parâmetros não informados" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 #, fuzzy msgid "at least one sed script must be specified" msgstr "pelo menos dois arquivos devem ser especificados" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap 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:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -954,7 +962,7 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 +#: src/msgfilter.c:402 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -967,6 +975,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -985,22 +995,22 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "" @@ -1010,18 +1020,18 @@ msgstr "" msgid "the argument to %s should be a single punctuation character" msgstr "" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "" @@ -1339,19 +1349,19 @@ msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: aviso: arquivo fonte contém traduções aproximadas" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1382,7 +1392,7 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 +#: src/msggrep.c:469 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1394,6 +1404,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1412,18 +1424,18 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "" -#: src/msginit.c:279 +#: src/msginit.c:284 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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1431,19 +1443,19 @@ msgid "" "the output .po file through the --output-file option.\n" msgstr "" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1452,7 +1464,7 @@ msgid "" "If it is -, standard input is read.\n" msgstr "" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1461,48 +1473,50 @@ msgid "" "locale setting. If it is -, the results are written to standard output.\n" msgstr "" -#: src/msginit.c:379 +#: src/msginit.c:384 #, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" msgstr "" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "" -#: src/msginit.c:451 +#: src/msginit.c:458 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1514,7 +1528,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "" @@ -1548,7 +1562,7 @@ 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:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "" @@ -1628,11 +1642,11 @@ msgid "" "built without iconv()." msgstr "" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, fuzzy, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1657,7 +1671,7 @@ msgstr "" "Os resultados serão gravados na saída padrão, a menos que um arquivo de\n" "saída seja especificado.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1668,7 +1682,7 @@ msgid "" " may be specified more than once\n" msgstr "" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1676,7 +1690,7 @@ msgid "" " do nothing if def.po already up to date\n" msgstr "" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1693,7 +1707,7 @@ msgid "" "environment variable.\n" msgstr "" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1703,17 +1717,17 @@ msgid "" " -q, --quiet, --silent suppress progress indicators\n" msgstr "" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 #, fuzzy msgid "this message should define plural forms" msgstr "esta mensagem é utilizada mas não definida em %s" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 #, fuzzy msgid "this message should not define plural forms" msgstr "esta mensagem é utilizada mas não definida em %s" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1722,26 +1736,26 @@ msgstr "" "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, " "perdidas %ld, obsoletas %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " feito.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, fuzzy, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s e %s são mutuamente exclusivos" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1749,7 +1763,7 @@ msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" msgstr "" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1757,7 +1771,7 @@ msgid "" "If no input file is given or if it is -, standard input is read.\n" msgstr "" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1767,7 +1781,7 @@ msgid "" "separated with an underscore. The class is located using the CLASSPATH.\n" msgstr "" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1777,7 +1791,7 @@ msgid "" "specified directory.\n" msgstr "" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1786,7 +1800,7 @@ msgid "" "or if it is -.\n" msgstr "" -#: src/msgunfmt.c:369 +#: src/msgunfmt.c:374 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -1796,6 +1810,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Uso: %s [OPÇÃO] [ARQUIVO]...\n" @@ -1811,7 +1827,7 @@ 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/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1820,7 +1836,7 @@ msgid "" " -v, --verbose increase verbosity level\n" msgstr "" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1833,7 +1849,7 @@ msgid "" "will be cumulated. When using the --unique option, duplicates are discarded.\n" msgstr "" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -1984,7 +2000,7 @@ msgstr "forma plural tem o msgid "too many errors, aborting" msgstr "excesso de erros - finalizando" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "sequência multibyte inválido" @@ -2087,7 +2103,7 @@ msgstr "" msgid "failed to create \"%s\"" msgstr "" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "erro ao gravar o arquivo \"%s\"" @@ -2101,14 +2117,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "erro ao abrir o arquivo \"%s\" para gravação" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2117,12 +2133,12 @@ msgid "" "%s\n" msgstr "" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "não foi possível criar o arquivo de saída \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "saída padrão" @@ -2137,7 +2153,7 @@ msgstr "%s:%d: aviso: caractere constante indeterminado" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: aviso: string literal indeterminada" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "este arquivo parece não conter diretivas de domínio" @@ -2156,33 +2172,33 @@ msgstr "" msgid "%s:%d: invalid string expression" msgstr "" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext não pode funcionar sem as teclas para procurar" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2192,7 +2208,7 @@ msgid "" "If output file is -, output is written to standard output.\n" msgstr "" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2204,7 +2220,7 @@ msgid "" "By default the language is guessed depending on the input file name extension.\n" msgstr "" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2214,7 +2230,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2225,7 +2241,7 @@ msgid "" " --debug more detailed formatstring recognition result\n" msgstr "" -#: src/xgettext.c:594 +#: src/xgettext.c:598 #, fuzzy, no-wrap msgid "" "Output details:\n" @@ -2237,6 +2253,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2260,18 +2278,18 @@ msgstr "" " -S, --strict habilita o modo Uniforum estrito\n" " -V, --version apresenta informações de versão e finaliza\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "entrada padrão" -#: src/xgettext.c:929 +#: src/xgettext.c:935 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:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "idioma `%s' desconhecido" diff --git a/po/ru.gmo b/po/ru.gmo index 34f5244ef..c1b10ddea 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 94f79d1eb..8995dae1e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-15 13:38+0300\n" "Last-Translator: Oleg S. Tihonov \n" "Language-Team: Russian \n" @@ -29,7 +29,7 @@ msgid "Valid arguments are:" 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ" @@ -238,11 +238,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %s" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -254,16 +254,16 @@ msgstr "" "× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n" "ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×" @@ -271,11 +271,11 @@ msgstr " msgid "missing arguments" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" @@ -337,15 +337,15 @@ msgstr "" "×Ù×ÏÄÑÔÓÑ ÉÈ ÐÅÒÅ×ÏÄÙ ÉÚ ÕËÁÚÁÎÎÏÇÏ ÄÏÍÅÎÁ.\n" "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]\n" @@ -370,9 +370,9 @@ msgstr "" " ÄÏÍÅÎÎÏÅ ÉÍÑ É ÐÓÅ×ÄÏÎÉÍÙ\n" " -i, --ip-address ÁÄÒÅÓÁ ÄÌÑ ÚÁÄÁÎÎÏÇÏ ÉÍÅÎÉ\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -387,28 +387,28 @@ msgstr "" msgid "could not get host name" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ÍÁÛÉÎÙ" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "ÐÒÉÎÉÍÁÅÔÓÑ ÎÅ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -417,15 +417,15 @@ msgstr "" "æÉÌØÔÒÕÅÔ ÓÏÏÂÝÅÎÉÑ ËÁÔÁÌÏÇÁ ÐÅÒÅ×ÏÄÏ× × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÉÈ ÁÔÒÉÂÕÔÁÍÉ\n" "É ÍÁÎÉÐÕÌÉÒÕÅÔ ÜÔÉÍÉ ÁÔÒÉÂÕÔÁÍÉ.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -438,8 +438,8 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -452,7 +452,7 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -471,7 +471,7 @@ msgstr "" " --no-obsolete ÕÄÁÌÉÔØ ÓÔÁÒÙÅ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ '#~'\n" " --only-obsolete ÓÏÈÒÁÎÉÔØ ÓÔÁÒÙÅ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ '#~'\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -490,8 +490,8 @@ msgstr "" " --fuzzy ÓÉÎÏÎÉÍ ÄÌÑ --only-fuzzy --clear-fuzzy\n" " --obsolete ÓÉÎÏÎÉÍ ÄÌÑ --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -502,6 +502,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -520,17 +522,17 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -554,7 +556,7 @@ msgstr "" "ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ. ëÏÍÍÅÎÔÁÒÉÉ, ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ\n" "ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -569,7 +571,7 @@ msgstr "" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -582,7 +584,7 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -603,8 +605,8 @@ msgstr "" " -u, --unique ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --less-than=2, ÚÁÐÒÁÛÉ×ÁÅÔ \n" " ÐÅÞÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÈ ÓÏÏÂÝÅÎÉÊ\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -618,6 +620,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -639,7 +643,7 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -650,15 +654,15 @@ msgstr "" " -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "ÎÅ ÚÁÄÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] def.po ref.pot\n" @@ -694,7 +698,7 @@ msgstr "" " ref.pot ÓÓÙÌËÉ ÎÁ ÉÓÈÏÄÎÉËÉ\n" " -D, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -703,15 +707,15 @@ msgstr "" "íÏÄÉÆÉËÁÔÏÒÙ:\n" " -m, --multi-domain ÐÒÉÍÅÎÉÔØ ref.pot ËÏ ×ÓÅÍ ÄÏÍÅÎÁÍ ÉÚ def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏÇÒÁÍÍÏÊ, ÎÏ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ÏÄÎÁËÏ ÚÄÅÓØ ÏÐÒÅÄÅÌÅÎÏ ÐÏÈÏÖÅÅ ÓÏÏÂÝÅÎÉÅ" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s" @@ -736,11 +740,11 @@ msgstr " msgid "...this is the location of the first definition" msgstr "...ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÎÅ ÍÅÎÅÅ Ä×ÕÈ ÆÁÊÌÏ×" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -760,7 +764,7 @@ msgstr "" "ÔÏÌØËÏ ÉÚ ÐÅÒ×ÏÇÏ PO-ÆÁÊÌÁ, × ËÏÔÏÒÏÍ ÏÎÉ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ. ëÏÍÍÅÎÔÁÒÉÉ,\n" "ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -781,8 +785,8 @@ msgstr "" " -u, --unique ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --less-than=2, ÚÁÐÒÁÛÉ×ÁÅÔ\n" " ÐÅÞÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÈ ÓÏÏÂÝÅÎÉÊ\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -793,6 +797,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -814,12 +820,12 @@ msgstr "" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" " --omit-header ÎÅ ×Ù×ÏÄÉÔØ ÚÁÇÏÌÏ×ÏË Ó ÐÏÌÅÍ `msgid \"\"'\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "ðÒÅÏÂÒÁÚÕÅÔ ËÁÔÁÌÏÇ ÐÅÒÅ×ÏÄÏ× × ÄÒÕÇÕÀ ËÏÄÉÒÏ×ËÕ.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -830,8 +836,8 @@ msgstr "" " -t, --to-code=éíñ ×ÙÈÏÄÎÁÑ ËÏÄÉÒÏ×ËÁ\n" "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÄÉÒÏ×ËÁ ÔÅËÕÝÅÊ ÌÏËÁÌÉ.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -842,6 +848,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -860,20 +868,20 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "ÎÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÒÏ×ÎÏ ÏÄÉÎ ×ÈÏÄÎÏÊ ÆÁÊÌ" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ÷èïäîïê-æáêì\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -886,7 +894,7 @@ msgstr "" "ÐÒÏÇÒÁÍÍÏÊ xgettext). îÅÐÅÒÅ×ÅÄÅÎÎÙÍ ÓÏÏÂÝÅÎÉÑÍ ÄÁÅÔÓÑ ÐÅÒÅ×ÏÄ,\n" "ÓÏ×ÐÁÄÁÀÝÉÊ Ó msgid, É ÏÎÉ ÐÏÍÅÞÁÀÔÓÑ ËÁË ÎÅÔÏÞÎÙÅ.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -932,7 +940,7 @@ msgstr "" "óÐÅÃÉÁÌØÎÁÑ ×ÓÔÒÏÅÎÎÁÑ ËÏÍÁÎÄÁ '0' ×Ù×ÏÄÉÔ ÐÅÒÅ×ÏÄ É ÚÁ ÎÉÍ ÎÕÌÅ×ÏÊ\n" "ÂÁÊÔ. ÷Ù×ÏÄ \"msgexec 0\" ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÅÒÅÄÁÞÉ ÎÁ ×ÈÏÄ \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -949,30 +957,30 @@ msgstr "" msgid "write to stdout failed" msgstr "ÚÁÐÉÓØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅÕÓÐÅÛÎÁ" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "ÚÁÐÉÓØ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÆÉÌØÔÒÁ" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÓÃÅÎÁÒÉÊ sed" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] æéìøôò [ëìàþ-æéìøôòá]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "ðÒÉÍÅÎÑÅÔ ÆÉÌØÔÒ ËÏ ×ÓÅÍ ÐÅÒÅ×ÏÄÁÍ ËÁÔÁÌÏÇÁ.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -981,7 +989,7 @@ msgstr "" "æÉÌØÔÒ ÍÏÖÅÔ ÂÙÔØ ÌÀÂÏÊ ÐÒÏÇÒÁÍÍÏÊ, ÞÉÔÁÀÝÅÊ ÐÅÒÅ×ÏÄ ÓÏ ÓÔÁÎÄÁÒÔÎÏÇÏ ××ÏÄÁ É\n" "ÐÅÞÁÔÁÀÝÅÊ ÉÚÍÅÎÅÎÎÙÊ ÐÅÒÅ×ÏÄ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -996,8 +1004,8 @@ msgstr "" " ×ÙÐÏÌÎÑÅÍÙÍ ËÏÍÁÎÄÁÍ\n" " -n, --quiet, --silent ×ÙËÌÀÞÉÔØ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÅÞÁÔØ ÏÂÒÁÚÃÁ\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1009,6 +1017,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1028,23 +1038,23 @@ msgstr "" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " -F, --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "" "ÎÅ×ÏÚÍÏÖÎÏ ÏÒÇÁÎÉÚÏ×ÁÔØ ÎÅÂÌÏËÉÒÕÀÝÉÊ ××ÏÄ/×Ù×ÏÄ ÄÌÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "ÐÏÐÙÔËÁ Ó×ÑÚÉ Ó ÄÏÞÅÒÎÉÍ ÐÒÏÃÅÓÓÏÍ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "ÞÔÅÎÉÅ ÏÔ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s ÎÅÕÓÐÅÛÎÁ" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d" @@ -1054,18 +1064,18 @@ msgstr " msgid "the argument to %s should be a single punctuation character" msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÄÉÎÏÞÎÙÍ ÐÕÎËÔÕÁÃÉÏÎÎÙÍ ÚÎÁËÏÍ" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-d ËÁÔÁÌÏÇ\"" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-l ÌÏËÁÌØ\"" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s" @@ -1440,12 +1450,12 @@ msgstr " msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "ËÌÀÞ '%c' ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÏ ÔÏÇÏ, ËÁË ÚÁÄÁÎÙ 'K' ÉÌÉ 'T'" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1455,7 +1465,7 @@ msgstr "" "ÚÁÄÁÎÎÏÍÕ ÏÂÒÁÚÃÕ ÉÌÉ ÐÒÉÎÁÄÌÅÖÁÔ ÚÁÄÁÎÎÙÍ ÉÓÈÏÄÎÙÍ ÆÁÊÌÁÍ.\n" "\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1516,8 +1526,8 @@ msgstr "" " -f, --file=æáêì ÐÏÌÕÞÉÔØ ïâòáúåã ÉÚ æáêìá\n" " -i, --ignore-case ÉÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË×\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1528,6 +1538,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1546,11 +1558,11 @@ msgstr "" " --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" " --sort-by-file ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "ÚÁÐÉÓØ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ grep ÎÅÕÓÐÅÛÎÁ" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1560,7 +1572,7 @@ msgstr "" "ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ ÓÒÅÄÙ LANG ËÁË ÏÐÉÓÁÎÏ × ÆÁÊÌÅ ABOUT-NLS. üÔÏ\n" "ÎÅÏÂÈÏÄÉÍÏ, ÞÔÏÂÙ ×Ù ÍÏÇÌÉ ÐÒÏ×ÅÒÉÔØ Ó×ÏÉ ÐÅÒÅ×ÏÄÙ.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1571,12 +1583,12 @@ msgstr "" "ðÏÖÁÊÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÌÏËÁÌØ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --locale ÉÌÉ ×ÙÈÏÄÎÏÊ\n" "po-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --output-file.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "óÏÚÄÁÎÏ %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1585,7 +1597,7 @@ msgstr "" "óÏÚÄÁÅÔ ÎÏ×ÙÊ PO-ÆÁÊÌ, ÉÎÉÃÉÁÌÉÚÉÒÕÑ ÍÅÔÁÉÎÆÏÒÍÁÃÉÀ ÉÓÈÏÄÑ ÉÚ\n" "ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÒÅÄÙ.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1598,7 +1610,7 @@ msgstr "" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ, ÏÎ ÉÝÅÔÓÑ × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ.\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1612,20 +1624,22 @@ msgstr "" "ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÌÏËÁÌÉ. åÓÌÉ ÏÎ ÚÁÄÁÎ ËÁË -, ÒÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ\n" "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "ðÏÄÒÏÂÎÏÓÔÉ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n" " -l, --locale=LL_CC ÚÁÄÁÅÔ ÃÅÌÅ×ÕÀ ÌÏËÁÌØ\n" " --no-translator ÐÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ PO-ÆÁÊÌ ÓÇÅÎÅÒÉÒÏ×ÁÎ Á×ÔÏÍÁÔÉÞÅÓËÉ\n" " -w, --width=þéóìï ÚÁÄÁÅÔ ÛÉÒÉÎÕ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1633,11 +1647,11 @@ msgstr "" "îÁÊÄÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ pot-ÆÁÊÌÁ.\n" "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "ÏÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÔÅËÕÝÅÇÏ ËÁÔÁÌÏÇÁ" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1645,23 +1659,23 @@ msgstr "" "÷ ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ ÎÅ ÎÁÊÄÅÎ pot-ÆÁÊÌ.\n" "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "×ÙÚÏ× fdopen() ÎÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÄÏÞÅÒÎÅÍ ÐÒÏÃÅÓÓÅ %s" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1677,7 +1691,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ %s" @@ -1713,7 +1727,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "ÃÅÌÅ×ÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " @@ -1816,11 +1830,11 @@ msgstr "" "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\". %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(). üÔÁ " "×ÅÒÓÉÑ ÂÙÌÁ ÓÏÂÒÁÎÁ ÂÅÚ iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "ÔÉÐ ÒÅÚÅÒ×ÎÏÇÏ ËÏÐÉÒÏ×ÁÎÉÑ" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1845,7 +1859,7 @@ msgstr "" "ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ\n" "ÓÏ×ÐÁÄÅÎÉÅ.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1862,7 +1876,7 @@ msgstr "" " -C, --compendium=æáêì ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÂÉÂÌÉÏÔÅËÁ ÐÅÒÅ×ÏÄÏ× ÓÏÏÂÝÅÎÉÊ, \n" " ÍÏÖÎÏ ÕËÁÚÙ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1873,7 +1887,7 @@ msgstr "" " -U, --update ÏÂÎÏ×ÉÔØ def.po,\n" " ÎÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ, ÅÓÌÉ def.po ÕÖÅ ÏÂÎÏ×ÌÅÎ\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1904,7 +1918,7 @@ msgstr "" "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n" "environment variable.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1919,15 +1933,15 @@ msgstr "" " -v, --verbose Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ ÓÏÏÂÝÅÎÉÊ\n" " -q, --quiet, --silent ÎÅ ×Ù×ÏÄÉÔØ ÉÎÄÉËÁÔÏÒ ÐÒÏÇÒÅÓÓÁ\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1936,26 +1950,26 @@ msgstr "" "%sðÒÏÞÉÔÁÎÏ ÓÏÏÂÝÅÎÉÊ: ÓÔÁÒÙÈ %ld + ÎÏ×ÙÈ %ld; ÏÂßÅÄÉÎÅÎÏ %ld, ÐÏÍÅÞÅÎÏ " "ÎÅÔÏÞÎÙÍÉ %ld, ÎÅÄÏÓÔÁÀÝÉÈ %ld, ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÙÈ %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " ÚÁ×ÅÒÛÅÎÏ.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s É Ñ×ÎÏ ÚÁÄÁÎÎÏÅ ÉÍÑ ÆÁÊÌÁ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [æáêì]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "ðÒÅÏÂÒÁÚÕÅÔ Ä×ÏÉÞÎÙÊ ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ × .po-ÆÁÊÌ × ÓÔÉÌÅ Uniforum.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1966,7 +1980,7 @@ msgstr "" " -j, --java ÒÅÖÉÍ Java: ÓÏÚÄÁÅÔ ËÌÁÓÓ ResourceBundle\n" " --tcl ÒÅÖÉÍ Tcl: ÓÏÚÄÁÅÔ .msg-ÆÁÊÌ ÄÌÑ tcl/msgcat\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1977,7 +1991,7 @@ msgstr "" " æáêì ... ×ÈÏÄÎÙÅ .mo-ÆÁÊÌÙ\n" "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1992,7 +2006,7 @@ msgstr "" "éÍÑ ËÌÁÓÓÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÕÔÅÍ ÄÏÂÁ×ÌÅÎÉÑ ÉÍÅÎÉ ÌÏËÁÌÉ Ë ÉÍÅÎÉ ÒÅÓÕÒÓÁ ÐÏÓÌÅ\n" "ÚÎÁËÁ ÐÏÄÞÅÒËÉ×ÁÎÉÑ. ëÌÁÓÓ ÉÝÅÔÓÑ Ó ÐÏÍÏÝØÀ CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2006,7 +2020,7 @@ msgstr "" " -d ëáôáìïç ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÉÅÒÁÒÈÉÉ .msg-ÆÁÊÌÏ×\n" "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ. .msg-ÆÁÊÌ ÉÝÅÔÓÑ × ÕËÁÚÁÎÎÏÍ ËÁÔÁÌÏÇÅ.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2019,8 +2033,8 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2029,6 +2043,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "ðÏÄÒÏÂÎÏÓÔÉ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n" @@ -2043,7 +2059,7 @@ msgstr "" " -w, --width=þéóìï ÚÁÄÁÅÔ ÛÉÒÉÎÕ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n" " -s, --sort-output ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2056,7 +2072,7 @@ msgstr "" " -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -v, --verbose Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ ÓÏÏÂÝÅÎÉÊ\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2079,7 +2095,7 @@ msgstr "" "ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÌÀÞÁ --unique, ÏÔÂÒÁÓÙ×ÁÀÔÓÑ ÄÕÂÌÉÒÏ×ÁÎÎÙÅ\n" "ÓÏÏÂÝÅÎÉÑ.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2237,7 +2253,7 @@ msgstr " msgid "too many errors, aborting" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ" @@ -2338,7 +2354,7 @@ msgstr "%s msgid "failed to create \"%s\"" msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÎÉÑ \"%s\" ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\"" @@ -2354,14 +2370,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2374,12 +2390,12 @@ msgstr "" "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù. ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgid ÞÉÓÔÏÊ ASCII.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" @@ -2395,7 +2411,7 @@ msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ" # ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ" @@ -2414,27 +2430,27 @@ msgstr "%s:%d: msgid "%s:%d: invalid string expression" msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÓÔÒÏËÏ×ÏÅ ×ÙÒÁÖÅÎÉÅ" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "ËÌÀÞ --join-existing ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÚÁÐÉÓÉ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "éÚ×ÌÅËÁÅÔ ÐÅÒÅ×ÏÄÉÍÙÅ ÓÔÒÏËÉ ÉÚ ÕËÁÚÁÎÎÙÈ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2443,7 +2459,7 @@ msgstr "" "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n" "ôÏ ÖÅ É ÄÌÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2459,7 +2475,7 @@ msgstr "" "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n" "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2477,7 +2493,7 @@ msgstr "" " -C, --c++ ÓÉÎÏÎÉÍ --language=C++\n" "ðÏ ÕÍÏÌÞÁÎÉÀ ÑÚÙË ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÒÁÓÛÉÒÅÎÉÀ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2493,7 +2509,7 @@ msgstr "" " ôåçïí (ÉÌÉ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÍÉ\n" " ËÌÀÞÅ×ÏÊ ÓÔÒÏËÅ)\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2512,8 +2528,8 @@ msgstr "" " --debug ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÒÅÚÕÌØÔÁÔ ÒÁÚÂÏÒÁ ÆÏÒÍÁÔÎÏÊ\n" " ÓÔÒÏËÉ\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2524,6 +2540,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2555,11 +2573,11 @@ msgstr "" " -M, --msgstr-suffix[=óôòïëá]\n" " ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÓÕÆÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ msgstr\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2569,7 +2587,7 @@ msgstr "" "gettext(\"\") ×ÏÚ×ÒÁÝÁÅÔ ÔÅËÓÔ ÚÁÇÏÌÏ×ËÁ Ó ÍÅÔÁÉÎÆÏÒÍÁÃÉÅÊ,\n" "Á ÎÅ ÐÕÓÔÕÀ ÓÔÒÏËÕ.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ" diff --git a/po/sk.gmo b/po/sk.gmo index ad6e7ae51..bd6b47d55 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index f5bf294d4..952adec52 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-13 20:02+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "Platné parametre sú:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "chyba pri otváraní súboru \"%s\" na èítanie" @@ -241,11 +241,11 @@ 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -257,16 +257,16 @@ msgstr "" "textoch. Neposkytujú sa ¾iadne záruky; ani v prípade predaja alebo pou¾itia\n" "na ¹peciálny úèel.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Napísal %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "príli¹ veµa parametrov" @@ -274,11 +274,11 @@ msgstr "pr msgid "missing arguments" msgstr "chýbajúci parameter" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n" @@ -339,11 +339,11 @@ msgstr "" "ktoré sa nachádzajú vo vybranom katalógu správ budú prelo¾ené.\n" "©tandardný adresár, v ktorom sa budú hµada» katalógy: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" "Správy o chybách zasielajte na adresu (iba " @@ -351,7 +351,7 @@ msgstr "" "Komentáre k slovenskému prekladu zasielajte na adresu .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Pou¾itie: %s [VO¥BA]\n" @@ -376,9 +376,9 @@ msgstr "" " doménového mena a prezývok\n" " -i, --ip-address adresy pre meno hostiteµa\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -393,28 +393,28 @@ msgstr "" msgid "could not get host name" msgstr "Nemô¾em získa» meno hostiteµa" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "povolený najviac jeden vstupný súbor" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s a %s sa navzájom vyluèujú" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -423,15 +423,15 @@ msgstr "" "Filtruje správy z prekladového katalógu podµa ich vlastností a mení tieto\n" "vlastnosti.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap 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:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -445,8 +445,8 @@ msgstr "" " vstupné súbory\n" "Ak nie je zadaný vstupný súbor alebo je -, naèítaný je ¹tandardný vstup.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -459,7 +459,7 @@ msgstr "" "Ak nie je zadaný výstupný súbor alebo je -, výsledky su zapísané\n" "na ¹tandardný výstup.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -478,7 +478,7 @@ msgstr "" " --no-obsolete odstráni» zastarané správy oznaèené #~\n" " --only-obsolete zachova» zastarané správy oznaèené #~\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -497,8 +497,8 @@ msgstr "" " --fuzzy synonymum pre --only-fuzzy --clear-fuzzy\n" " --obsolete synonymum pre --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -509,6 +509,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -528,17 +530,17 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -561,7 +563,7 @@ 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:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -577,7 +579,7 @@ msgstr "" " vstupné súbory\n" "Ak je vstupný súbor -, naèítaný je ¹tandardný vstup.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -590,7 +592,7 @@ msgstr "" "Ak nie je zadaný výstupný súbor alebo je -, výsledky su zapísané\n" "na ¹tandardný výstup.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -611,8 +613,8 @@ msgstr "" " -u, --unique skratka pre --less-than=2, nastavuje výpis\n" " len unikátnych správ\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -626,6 +628,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -648,7 +652,7 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -659,15 +663,15 @@ msgstr "" " -h, --help zobrazi» túto nápovedu a skonèi»\n" " -V, --version zobrazi» informáciu o verzii a skonèi»\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "neboli zadané vstupné súbory" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "potrebné sú presne 2 vstupné súbory" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Pou¾itie: %s [VO¥BA] def.po ref.pot\n" @@ -703,7 +707,7 @@ msgstr "" " -D, --directory=ADRESÁR prida» ADRESÁR do zoznamu pre vyhµadávané\n" " vstupné súbory\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -712,15 +716,15 @@ msgstr "" "Modifikátory operácie:\n" " -m, --multi-domain opu¾ije ref.pot na v¹etky domény v def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "táto správa je pou¾itá, ale nie je definovaná..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ale táto definícia je podobná" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, 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" @@ -745,11 +749,11 @@ msgstr "duplicitn msgid "...this is the location of the first definition" msgstr "...toto je miesto prvého definovania" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "musia by» uvedené minimálne dva súbory" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -769,7 +773,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:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -790,8 +794,8 @@ msgstr "" " -u, --unique skratka pre --less-than=2, nastavuje výpis\n" " len unikátnych správ\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -802,6 +806,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -823,12 +829,12 @@ msgstr "" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" " --omit-header nezapisova» hlavièku s polo¾kou `msgid \"\"'\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap 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:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -839,8 +845,8 @@ msgstr "" " -t, --to-code=NÁZOV kódovanie výstupu\n" "Predvolené kódovanie je kódovanie aktuálneho národného prostreda.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -851,6 +857,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -869,20 +877,20 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "nie sú zadané vstupné súbory" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "potrebné je presne jeden vstupný súbor" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Pou¾itie: %s [VO¥BA] VSTUPNÝSÚBOR\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -895,7 +903,7 @@ msgstr "" "programom xgettext). Neprelo¾eným polo¾kám je priradený preklad\n" "zhodný z msgid a sú oznaèené ako nepresné (fuzzy).\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -942,7 +950,7 @@ 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:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -960,30 +968,30 @@ msgstr "" msgid "write to stdout failed" msgstr "zápis na ¹tandardný výstup zlyhal" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "zápis do podprocesu %s zlyhal" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "chýbajúci názov filtra" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "musí by» uvedený aspoò jeden sed skript" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Pou¾itie: %s [VO¥BA] FILTER [VO¥BA-FILTRA]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap 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:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -992,7 +1000,7 @@ msgstr "" "FILTER mô¾e by» µubovoµný program, ktorý èíta preklady zo ¹tandardného vstupu\n" "a zapisuje upravené preklady na ¹tandardný výstup.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -1007,8 +1015,8 @@ msgstr "" " príkazom\n" " -n, --quiet, --silent potlaèi» automatickú tlaè priestoru vzorov\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1020,6 +1028,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1040,22 +1050,22 @@ msgstr "" " -s, --sort-output generova» utriedený výstup\n" " -F, --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, 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:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "komunikácia s podprocesom %s zlyhala" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "èítanie z podprocesu %s zlyhalo" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "podproces %s bol ukonèený s ukonèovacím kódom %d" @@ -1065,18 +1075,18 @@ msgstr "podproces %s bol ukon 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:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s vy¾aduje ¹pecifikáciu \"-d adresár\"" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s vy¾aduje ¹pecifikáciu \"-l národné prostredie\"" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s je platné len s %s" @@ -1441,12 +1451,12 @@ msgstr "nepresn msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "voµba '%c' nemô¾e by» pou¾itá pred ¹pecifikovaným 'K' alebo 'T'" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1455,7 +1465,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:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1514,8 +1524,8 @@ 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:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1526,6 +1536,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1544,11 +1556,11 @@ msgstr "" " --sort-outout generova» utriedený výstup\n" " --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "zlyhal zápis do podprocesu grep" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1559,7 +1571,7 @@ msgstr "" "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestova»\n" "va¹e preklady.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1570,12 +1582,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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Vytvorený %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1584,7 +1596,7 @@ msgstr "" "Vytvorí nový PO súbor, inicializuje meta informácie podµa hodnôt z prostredia\n" "pou¾ívateµa.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1597,7 +1609,7 @@ msgstr "" "Ak nie je zadaný vstupný súbor, bude vyhµadaný POT súbor v aktuálnom adresári.\n" "Ak je -, naèítaný je ¹tandardný vstup.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1611,20 +1623,22 @@ 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:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Podrobnosti výstupu:\n" " -l, --locale=LL_CC nastavi» cieµové národné prostredie\n" " --no-translator oznaèi», ¾e PO súbor je generovaný automaticky\n" " -w, --width=ÈÍSLO nastavi» ¹írku výstupnej strany\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1632,11 +1646,11 @@ 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:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "chyba pri èítaní adresára" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1644,23 +1658,23 @@ 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:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() zlyhalo" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "V/V chyba podprocesu %s" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "podproces %s zlyhal s ukonèovacím kódom %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1677,7 +1691,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Slovenské preklady pre balík %s" @@ -1712,7 +1726,7 @@ 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:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "upozornenie: " @@ -1818,11 +1832,11 @@ msgstr "" "Nemô¾em konvertova» z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia " "bola prelo¾ená bez iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "typ zálohy" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1846,7 +1860,7 @@ msgstr "" "pri ktorých nie je mo¾né nájs» presnú zhodu, bude pou¾itý fuzzy algoritmus,\n" "ktorý dosahuje lep¹ie výsledky.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1864,7 +1878,7 @@ msgstr "" " -C, --compendium=SÚBOR prídavna kni¾nica prekladov správ, mô¾e by»\n" " zadaná viac ako raz\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1875,7 +1889,7 @@ msgstr "" " -U, --update aktualizova» def.po,\n" " nerobi» niè, ak def.po je aktuálny\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1904,7 +1918,7 @@ msgstr "" "Prípona zálohy je '~', pokiaµ nie je zadaná voµba --suffix alebo nastavená\n" "premenná prostredia SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1919,15 +1933,15 @@ msgstr "" " -v, --verbose zvý¹i» úroveò táravosti\n" " -q, --quiet, --silent potlaèi» indikátory postupu\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "táto správa by mala definova» tvary mno¾ného èísla" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "táto správa by nemala definova» tvary mno¾ného èísla" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1936,26 +1950,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:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " hotovo.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, 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:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Pou¾itie: %s [VO¥BA] [SÚBOR]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap 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:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1966,7 +1980,7 @@ msgstr "" " -j, --java mód Java: vstup je trieda Java ResourceBundle\n" " --tcl mód Tcl: vstup je súbor .msg tcl/msgcat\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1977,7 +1991,7 @@ msgstr "" " SÚBOR ... vstupný .mo súbor\n" "Ak nie je zadaný vstupný súbor alebo je -, je naèítaný ¹tandardný vstup.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1994,7 +2008,7 @@ msgstr "" "oddelených\n" " znakom \"_\". Trieda je umiestnená pomocou CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -2009,7 +2023,7 @@ msgstr "" " -d ADRESÁR základný adresár katalógov správ .msg\n" "Voµby -l a -d sú povinné. Súbor .msg je umiestnený v zadaného adresára.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -2022,8 +2036,8 @@ msgstr "" "Výsledky sú zapísané na ¹tandardný výstup ak nie je zadaný výstupný súbor\n" "alebo ak je -.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2032,6 +2046,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Podrobnosti výstupu:\n" @@ -2045,7 +2061,7 @@ msgstr "" " -w, --width=©ÍRKA nastavi» ¹írku výstupnej stránky\n" " -s, --sort-outout generova» utriedený výstup\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2058,7 +2074,7 @@ msgstr "" " -V, --version zobrazi» informáciu o verzii a skonèi»\n" " -v, --verbose zvý¹i» úroveò táravosti\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2079,7 +2095,7 @@ 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:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2236,7 +2252,7 @@ msgstr "mno msgid "too many errors, aborting" msgstr "vyskytlo sa príli¹ veµa chýb, ukonèuje sa program" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "neplatná viacznaková sekvencia" @@ -2337,7 +2353,7 @@ msgstr "nie je platn msgid "failed to create \"%s\"" msgstr "zlyhalo vytvorenie \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "chyba poèas zápisu do súboru \"%s\"" @@ -2352,13 +2368,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "chyba pri otváraní súboru \"%s\" na zápis" -#: src/write-po.c:390 +#: src/write-po.c:402 #, 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:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2371,12 +2387,12 @@ msgstr "" "ako vy. Zvá¾te namiesto to pou¾itie msgid len s ASCII znakmi.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "nie je mo¾né vytvori» výstupný súbor \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "¹tandardný výstup" @@ -2391,7 +2407,7 @@ msgstr "%s:%d: upozornenie: neukon msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: upozornenie: neukonèený znakový re»azec" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "tento súbor nesmie obsahova» direktívy pre doménu" @@ -2410,27 +2426,27 @@ msgstr "%s:%d: ch msgid "%s:%d: invalid string expression" msgstr "%s:%d: neplatný výraz re»azca" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 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:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap 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:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2439,7 +2455,7 @@ msgstr "" "Povinné parametre dlhých volieb sú povinné aj pre krátke voµby.\n" "Podobne aj pre voliteµné parametre.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2454,7 +2470,7 @@ msgstr "" " -p, --output-dir=ADRESÁR výstupné súbory budú umiestnené v adresári ADRESÁR\n" "Ak je výstupný súbor -, výstup je zapísaný na ¹tandardný výstup.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2473,7 +2489,7 @@ msgstr "" " -C, --c++ skratka pre --language=C++\n" "©tandardne je jazyk odhadnutý podµa prípony vstupného súboru.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2489,7 +2505,7 @@ msgstr "" " (alebo tie, ktoré predchádzajú kµúèové riadky)\n" " do výstupného súboru\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2508,8 +2524,8 @@ msgstr "" " --debug detailnej¹ie výsledky rozoznávania formátovacích\n" " re»azcov\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2520,6 +2536,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2552,11 +2570,11 @@ msgstr "" " -M, --msgstr-suffix[=RE«AZEC] pou¾i» RE«AZEC alebo \"\" ako príponu pre\n" " polo¾ky msgstr\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "¹tandardný vstup" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2566,7 +2584,7 @@ msgstr "" "gettext(\"\") vráti hlavièku s meta informáciami\n" "a nie prázdny re»azec.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "jazyk `%s' je neznámy" diff --git a/po/sl.gmo b/po/sl.gmo index 7bc540a81..29e9f8aab 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 97c7243bf..f7c698717 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-13 19:21+0100\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -32,7 +32,7 @@ msgid "Valid arguments are:" msgstr "Veljavni argumenti so:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "datoteke \"%s\" ni moè odpreti za branje" @@ -242,11 +242,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "formatni doloèili v ,msgid` in ,%s` za argument ,%s` nista enaki" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -258,16 +258,16 @@ msgstr "" "raz¹irjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n" "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA RABO.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Avtor %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "preveè argumentov" @@ -275,11 +275,11 @@ msgstr "preve msgid "missing arguments" msgstr "argumenti manjkajo" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poskusite ,%s --help` za izèrpnej¹a navodila\n" @@ -338,15 +338,15 @@ msgstr "" "kataloga sporoèil.\n" "Privzet imenik s katalogom sporoèil: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "Morebitne napake v programu sporoèite na .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Uporaba: %s [IZBIRA]\n" @@ -371,9 +371,9 @@ msgstr "" " internetim imenom in vzdevki\n" " -i, --ip-address internetni naslov za gostiteljsko ime\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -388,28 +388,28 @@ msgstr "" msgid "could not get host name" msgstr "gostiteljskega imena ni moè ugotoviti" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "dovoljena je najveè ena vhodna datoteka" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s in %s se med seboj izkljuèujeta" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -418,17 +418,17 @@ msgstr "" "Filtriranje sporoèil iz kataloga prevodov glede na njihova doloèila\n" "in rokovanje z njimi.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n" "tudi za kratko obliko.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -441,8 +441,8 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -455,7 +455,7 @@ msgstr "" "Èe izhodna datoteka ni podana ali je enaka -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -474,7 +474,7 @@ msgstr "" " --no-obsolete brez zastarelih (#~) sporoèil\n" " --only-obsolete zgolj zastarela (#~) sporoèila\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -493,8 +493,8 @@ msgstr "" " --fuzzy isto kot --only-fuzzy --clear-fuzzy\n" " --obsolete isto kot --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -505,6 +505,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -521,17 +523,17 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "doloèeni kriteriji izbire niso mogoèi (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -553,7 +555,7 @@ msgstr "" "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n" "v datotekah iz vseh datotek PO se ohranijo.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -568,7 +570,7 @@ msgstr "" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" "Èe je vhodna datoteka enaka -, se bere standardni vhod.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -581,7 +583,7 @@ msgstr "" "Èe izhodna datoteka ni podana ali je enaka -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -600,8 +602,8 @@ msgstr "" " -u, --unique okraj¹ava za --less-than=2, izpi¹emo samo\n" " enolièno definirana sporoèila\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -615,6 +617,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -634,7 +638,7 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -645,15 +649,15 @@ msgstr "" " -h, --help ta navodila\n" " -V, --version razlièica programa\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "vhodni datoteki nista podani" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "potrebni sta natanèno dve vhodni datoteki" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n" @@ -688,7 +692,7 @@ msgstr "" " ref.pot sklici na vire\n" " -D, --directory=IMENIK vhodne datoteke i¹èemo tudi v navedenem IMENIKU\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -697,15 +701,15 @@ msgstr "" "Modifikatorji delovanja:\n" " -m, --multi-domain ref.po uporabimo na vseh domenah iz def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "to sporoèilo je uporabljeno, a ne definirano..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...a ta definicija je podobna" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "to sporoèilo je uporabljeno, a ne definirano v %s" @@ -731,11 +735,11 @@ msgstr "podvojena definicija sporo msgid "...this is the location of the first definition" msgstr "...to je kraj prve definicije" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "podani morata biti vsaj dve datoteki" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -754,7 +758,7 @@ msgstr "" "pri izvlaèenju se ohranijo samo iz prve podane datoteke PO. Mesta v datotekah \n" "se ohranijo iz vseh datotek PO.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -774,8 +778,8 @@ msgstr "" " -u, --unique okraj¹ava za --less-than=2, izpi¹emo samo\n" " enolièno definirana sporoèila\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -786,6 +790,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -804,12 +810,12 @@ msgstr "" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" " --omit-header brez glave z vnosom \"msgid\"\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Pretvarjanje kataloga sporoèil v drug kodni nabor.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -820,8 +826,8 @@ msgstr "" " -t, --to-code=NABOR nabor znakov izhodne datoteke\n" "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -832,6 +838,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -848,20 +856,20 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "vhodna datoteka ni podana" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "zahtevana je natanèno ena vhodna datoteka" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -874,7 +882,7 @@ msgstr "" "ukazom xgettext). Neprevedenim sporoèilom se pripi¹e prevod, enak izvirniku\n" "msgid; taki prevodi so oznaèeni kot ohlapni.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -919,7 +927,7 @@ msgstr "" "Poseben vgrajen ukaz ,0` izpi¹e prevod in izpis zakljuèi z znakom s kodo niè.\n" "Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -936,30 +944,30 @@ msgstr "" msgid "write to stdout failed" msgstr "izpis na standardni izhod neuspe¹en" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "posredovanje podatkov podprocesu %s neuspe¹no" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "manjka ime filtra" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "podan mora biti vsaj en skript v sed" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -968,7 +976,7 @@ msgstr "" "FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n" "vhoda in izpi¹e spremnjen prevod na standardni izhod.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -983,8 +991,8 @@ msgstr "" " ki se izvedejo\n" " -n, --quiet, --silent brez samodejnega izpisa prostora vzorcev\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -996,6 +1004,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1012,22 +1022,22 @@ msgstr "" " -s, --sort-output izhod abecedno urejen po sporoèilih\n" " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "s podprocesom %s ni mogoèe vzpostaviti nebloène V/I povezave" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "povezava s podprocesom %s neuspe¹na" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "branje izhoda podprocesa %s neuspe¹no" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "podproces %s zakljuèil z izhodno kodo %d" @@ -1037,18 +1047,18 @@ msgstr "podproces %s zaklju msgid "the argument to %s should be a single punctuation character" msgstr "argument %s mora biti eno samo loèilo" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s zahteva doloèitev \"-d directory\"" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s zahteva doloèitev \"-l locale\"" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s je veljavno edino z %s" @@ -1421,12 +1431,12 @@ msgstr "ohlapni vnos za polje ,msgstr` zavr msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "izbire ,%c` ni moè uporabiti, preden sta izbrana bodisi ,K` bodisi ,T`" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1435,7 +1445,7 @@ msgstr "" "Izvleèemo vsa sporoèila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n" "pripadajo dani izvorni datoteki.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1497,8 +1507,8 @@ msgstr "" " -f, --file=DATOTEKA VZOREC preberemo iz navedene datoteke\n" " -i, --ignore-case ne razlikujemo med velikimi in malimi èrkami\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1509,6 +1519,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1525,11 +1537,11 @@ msgstr "" " --sort-output izhod abecedno urejen po sporoèilih\n" " --sort-by-file izhod abecedno urejen po izvornih datotekah\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "pisanje podprocesu grep neuspe¹no" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1539,7 +1551,7 @@ msgstr "" "spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n" "Brez tega ne morete preizkusiti va¹ih prevodov.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1550,12 +1562,12 @@ msgstr "" "Prosim, izberite jezikovno okolje z izbiro --locale, ali pa\n" "doloèite izhodno datoteko PO z izbiro --output-file.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Ustvarjena datoteka %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1564,7 +1576,7 @@ msgstr "" "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n" "uporabnikovega jezikovnega okolja.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1577,7 +1589,7 @@ msgstr "" "Èe vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem imeniku.\n" "Èe je enaka -, se bere standardni vhod.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1591,20 +1603,22 @@ msgstr "" "nastavitev uporabnikovega jezikovnega okolja. Èe je kot izhodna datoteka \n" "podan -, se rezultat izpi¹e na standardni izhod.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Podrobnosti izpisa:\n" " -l, --locale=JJ_DD doloèitev ciljnega jezikovnega okolja\n" " --no-translator privzamemo, da je datoteka PO samodejno ustvarjena\n" " -w, --width=©TEVILO ¹irina strani pri izpisu, v znakih\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1612,11 +1626,11 @@ msgstr "" "Na¹li smo veè kot eno datoteko .pot.\n" "Prosim, doloèite vhodno datoteko .pot z izbiro --input.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "napaka pri branju trenutnega imenika" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1624,23 +1638,23 @@ msgstr "" "V trenutnem imeniku ni najti nobene datoteke .pot.\n" "Prosim, doloèite vhodno datoteko .pot z izbiro --input.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "klic fdopen() neuspe¹en" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "V/I napaka v podprocesu %s" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "podproces %s neuspe¹en z izhodno kodo %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1655,7 +1669,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Slovenski prevodi paketa %s" @@ -1691,7 +1705,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora." #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "opozorilo: " @@ -1796,11 +1810,11 @@ msgstr "" "Pretvorba iz \"%s\" v \"%s\" ni mogoèa. %s klièe iconv(), vendar ta izvod " "programa ni preveden za uporabo iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "vrsta varnostne kopije" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1823,7 +1837,7 @@ msgstr "" "pa bodo strojno ustvarjeni komentarji in podatki o ¹tevilki vrstice. Kjer\n" "natanènega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1840,7 +1854,7 @@ msgstr "" " -C, --compendium=DATOTEKA dodatna knji¾nica s prevodi sporoèil; navedemo\n" " lahko veè kot eno\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1851,7 +1865,7 @@ msgstr "" " -U, --update posodobimo def.po,\n" " èe je ¾e posodobljen, ne storimo niè\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1881,7 +1895,7 @@ msgstr "" "Varnostna kopija ima pripono ,~`, razen èe ni z izbiro --suffix ali\n" "spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugaèe. \n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1896,15 +1910,15 @@ msgstr "" " -v, --verbose z ob¹irnej¹o razlago delovanja med potekom\n" " -q, --quiet, --silent brez kazalnika poteka\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "pri tem sporoèilu bi morale biti doloèene mno¾inske oblike" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "pri tem sporoèilu ne bi smele biti doloèene mno¾inske oblike" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1913,26 +1927,26 @@ msgstr "" "%sPrebrano %ld starih + %ld referenènih, zdru¾enih %ld, ohlapnih %ld, " "manjkajoèih %ld, opu¹èenih %ld.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " opravljeno.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s in izrecna imena datotek se med seboj izkljuèujejo" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "Pretvorba kataloga sporoèil iz binarne oblike .mo v obliko Uniforum .po.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1944,7 +1958,7 @@ msgstr "" " ResourceBundle\n" " --tcl naèin tcl: vhod je datoteka tcl/msgcat .msg\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1955,7 +1969,7 @@ msgstr "" " DATOTEKA ... datoteka MO (ali veè datotek MO)\n" "Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1970,7 +1984,7 @@ msgstr "" "Ime razreda je sestavljeno iz imena sredstva, ki se mu, loèeno s podèrtajem,\n" "pridá ime jezikovnega okolja. Razred je doloèen s spremenljivko CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1984,7 +1998,7 @@ msgstr "" " -d IMENIK korenski imenik hierarhije razredov\n" "Izbiri -l in -d sta obvezni. Datoteka .msg se zapi¹e v podani imenik.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1997,8 +2011,8 @@ msgstr "" "Èe izhodna datoteka ni podana ali je enaka -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2007,6 +2021,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Podrobnosti izpisa:\n" @@ -2019,7 +2035,7 @@ msgstr "" " -w, --width=©TEVILO ¹irina strani pri izpisu, v znakih\n" " -s, --sort-output abecedno urejen izpis\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2032,7 +2048,7 @@ msgstr "" " -V, --version razlièica programa\n" " -v, --verbose s podrobnej¹o razlago delovanja med potekom\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2053,7 +2069,7 @@ msgstr "" "ohranijo le komentarji prvega prevoda. Ohranijo se vsi podatki o mestu\n" "sporoèila v izvorni datoteki. Z izbiro --unique se podvojena sporoèila zavr¾ejo.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2209,7 +2225,7 @@ msgstr "mno msgid "too many errors, aborting" msgstr "preveè napak, nadaljevanje ni mo¾no" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "neveljavno veèzlo¾no zaporedje" @@ -2310,7 +2326,7 @@ msgstr "ni veljavno javansko ime razreda: %s" msgid "failed to create \"%s\"" msgstr "ustvarjanje \"%s\" neuspe¹no" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "napaka pri pisanju na datoteko \"%s\"" @@ -2326,14 +2342,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "napaka pri pisanju na \"%s\"" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internacionalizirana sporoèila ne smejo vsebovati ube¾ne sekvence ,\\%c'" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2348,12 +2364,12 @@ msgstr "" "vi. Razmislite o uporabi sporoèil v naboru znakov ASCII.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "izhodne datoteke \"%s\" ni mogoèe ustvariti" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standardni izhod" @@ -2368,7 +2384,7 @@ msgstr "%s:%d: opozorilo: nezaklju msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: opozorilo: nezakljuèen niz" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "ta datoteka morda ne vsebuje direktiv domene" @@ -2387,26 +2403,26 @@ msgstr "%s:%d: za # manjka msgid "%s:%d: invalid string expression" msgstr "%s:%d: niz ni veljaven izraz" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext ne deluje brez kljuènih besed, ki naj jih i¹èe" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "" "opozorilo: vrsta datoteka ,%s' s pripono ,%s' ni prepoznana; posku¹amo C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Iz vhodnih datotek izvleèemo prevedljive nize znakov.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2415,7 +2431,7 @@ msgstr "" "Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n" "tudi za kratko obliko. Enako za neobvezne argumente.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2431,7 +2447,7 @@ msgstr "" "Èe je kot izhodna datoteka navedeno -, se rezultat izpi¹e na standardni\n" "izhod.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2449,7 +2465,7 @@ msgstr "" " -C, --c++ okraj¹ava za --language=C++\n" "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2464,7 +2480,7 @@ msgstr "" " -c, --add-comments[=ZNAÈKA] v vhodno datoteko dodamo komentar z navedeno\n" " ZNAÈKO\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2482,8 +2498,8 @@ msgstr "" " --debug bolj razèlenjen rezultat razpoznave\n" " oblikovnega niza\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2494,6 +2510,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2520,11 +2538,11 @@ msgstr "" " -m, --msgstr-prefix[=NIZ] NIZ ali \"\" kot predpona za msgstr\n" " -m, --msgstr-suffix[=NIZ] NIZ ali \"\" kot pripona za msgstr\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standardni vhod" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2534,7 +2552,7 @@ msgstr "" "gettext(\"\") vrne glavo z metapodatki, ne pa\n" "praznega niza.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "jezik ,%s` ni poznan" diff --git a/po/sv.gmo b/po/sv.gmo index fbfb9a331..58513495e 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index cd127897a..a6e5efe51 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-16 17:47+0100\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "Giltiga argument är:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "fel uppstod när \"%s\" öppnades för läsning" @@ -248,11 +248,11 @@ msgstr "" "formateringsdirektiv i \"msgid\" och \"%s\" för argument \"%s\" är inte " "likadana" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -264,16 +264,16 @@ msgstr "" "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n" "ÄNDAMÅL.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "Skrivet av %s.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "för många argument" @@ -281,11 +281,11 @@ msgstr "f msgid "missing arguments" msgstr "argument saknas" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Försök med \"%s --help\" för mer information.\n" @@ -345,17 +345,17 @@ msgstr "" "översätts de argument som hittas i den valda meddelandekatalogen.\n" "Normal katalog för meddelandekataloger: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" "Rapportera fel till .\n" "Rapportera fel och synpunkter på översättningen till .\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Användning: %s [FLAGGA]\n" @@ -379,9 +379,9 @@ msgstr "" " -f, --fqdn, --long långt värdnamn, innehåller hela domännamnet och alias\n" " -i, --ip-address adresser för värdnamnet\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -396,28 +396,28 @@ msgstr "" msgid "could not get host name" msgstr "kunde inte hämta värdnamn" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "högst en infil tillåten" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s och %s är ömsesidigt uteslutande" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Användning: %s [FLAGGA] [INFIL]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -426,15 +426,15 @@ msgstr "" "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n" "manipulerar attributen.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -447,8 +447,8 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om ingen infil är given eller om den är - läses standard in.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -460,7 +460,7 @@ msgstr "" " -o, --output-file=FIL skriv resultat till angiven fil\n" "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -479,7 +479,7 @@ msgstr "" " --no-obsolete ta bort föråldrade #~ meddelanden\n" " --only-obsolete behåll föråldrade #~ meddelanden\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -498,8 +498,8 @@ msgstr "" " --fuzzy samma som --only-fuzzy --clear-fuzzy\n" " --obsolete samma som --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -510,6 +510,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -527,17 +529,17 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "omöjligt urvalskriterium angivet (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Användning: %s [FLAGGA] [INFIL]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -560,7 +562,7 @@ msgstr "" "utom om --use-first ges. Då tas de endast från den första PO-filen som\n" "definierar dem. Filpositioner från alla filer bevaras.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -575,7 +577,7 @@ msgstr "" " -D, --directory=KATALOG sök infiler även i KATALOG\n" "Om infil är - läses standard in.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -587,7 +589,7 @@ msgstr "" " -o, --output-file=FIL skriv resultat till angiven fil\n" "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -607,8 +609,8 @@ msgstr "" " -u, --unique samma som --less-than=2, begär att\n" " endast unika meddelanden skrivs\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -622,6 +624,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -642,7 +646,7 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition \n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -653,15 +657,15 @@ msgstr "" " -h, --help visa denna hjälptext och avsluta\n" " -V, --version visa versionsinformation och avsluta\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "inga infiler givna" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "exakt 2 infiler krävs" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Användning: %s [FLAGGA] def.po ref.pot\n" @@ -697,7 +701,7 @@ msgstr "" " ref.pot referenser till källkod\n" " -D, --directory=KATALOG sök infiler även i KATALOG\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -706,15 +710,15 @@ msgstr "" "Bearbetningsvarianter:\n" " -m, --multi-domain tillämpa ref.pot till alla domäner i def.po\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "detta meddelande används men är inte definierat..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...men denna definition är likartad" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "detta meddelande används men är inte definierat i %s" @@ -738,11 +742,11 @@ msgstr "meddelandedefinitionen msgid "...this is the location of the first definition" msgstr "...detta är platsen för den första definitionen" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "minst två filer måste anges" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -763,7 +767,7 @@ msgstr "" "endast från den första PO-filen som definierar dem. Filpositioner från\n" "alla filer bevaras.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -783,8 +787,8 @@ msgstr "" " -u, --unique samma som --less-than=2, begär att\n" " endast unika meddelanden skrivs\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -795,6 +799,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -814,12 +820,12 @@ msgstr "" " -F, --sort-by-file sortera resultatet efter filposition\n" " --omit-header skriv inte ut huvudet med 'msgid \"\"'\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Konverterar en meddelandekatalog till en annan teckenkodning.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -830,8 +836,8 @@ msgstr "" " -t, --to-code=NAMN Kodning för utdata\n" "Standardvärde är nuvarande lokals kodning.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -842,6 +848,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -859,20 +867,20 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "inga infiler givna" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "exakt en infil krävs" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Användning: %s [FLAGGA] INFIL\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -885,7 +893,7 @@ msgstr "" "Oöversatta poster ges en översättning som är identisk med msgid samt\n" "markeras som luddig.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -932,7 +940,7 @@ msgstr "" "av ett nolltecken. Utdata för \"msgexec 0\" är lämpligt som indata för\n" "\"xargs -O\"\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -949,30 +957,30 @@ msgstr "" msgid "write to stdout failed" msgstr "skrivning till standard ut misslyckades" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "skrivning till %s-barnprocess misslyckades" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "filternamn saknas" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "minst ett sed-skript måste anges" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Tillämpar ett filter på alla översättningar i en meddelandekatalog.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -981,7 +989,7 @@ msgstr "" "FILTER kan vara vilket program som helst som läser en översättning från\n" "standard in och skriver den modifierade översättningen till standard ut.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -996,8 +1004,8 @@ msgstr "" " att exekvera\n" " -n, --quiet, --silent undertryck automatisk utskrift av resultat\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1009,6 +1017,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1027,22 +1037,22 @@ msgstr "" " -s, --sort-output sortera resultatet\n" " -F, --sort-by-file sortera resultatet efter filposition\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "kan inte sätta upp icke-blockerande I/O till %s-barnprocess" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "kommunikation med %s-barnprocess misslyckades" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "läsning från %s-barnprocess misslyckades" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s-barnprocess avslutade med slutstatus %d" @@ -1052,18 +1062,18 @@ msgstr "%s-barnprocess avslutade med slutstatus %d" msgid "the argument to %s should be a single punctuation character" msgstr "argumentet till %s ska vara ett enskilt skiljetecken" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s kräver att \"-d katalog\" anges" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s kräver att \"-l lokal\" anges" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s är endast giltig med %s" @@ -1417,12 +1427,12 @@ msgstr "luddig \"msgstr\"-rad ignorerad" msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: varning: källfilen innehåller luddiga översättningar" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "flagga \"%c\" kan inte användas förrän \"K\" eller \"T\" angivits" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1431,7 +1441,7 @@ msgstr "" "Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n" "mönster eller hör till någon given källkodsfil.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1489,8 +1499,8 @@ msgstr "" " -f, --file=FIL hämta MÖNSTER från FIL\n" " -i, --ignore-case versaler och gemener jämförs lika\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1501,6 +1511,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1518,11 +1530,11 @@ msgstr "" " --sort-output sortera resultatet\n" " --sort-by-file sortera resultatet efter filposition\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "skrivning till grep barnprocess misslyckades" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1532,7 +1544,7 @@ msgstr "" "LANG såsom beskrivs i filen ABOUT-NLS. Detta är nödvändigt för att\n" "du ska kunna testa dina översättningar.\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1543,12 +1555,12 @@ msgstr "" "Ange lokal med flaggan --locale eller\n" ".po-utfilen med flaggan --output-file.\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "Skapade %s.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" @@ -1557,7 +1569,7 @@ msgstr "" "Skapar en ny PO-fil och initierar metainformation med värden från\n" "användarens miljövariabler.\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1570,7 +1582,7 @@ msgstr "" "Om ingen infil ges söks POT-filen i aktuell katalog.\n" "Om den är - läses standard in.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1583,20 +1595,22 @@ msgstr "" "Om ingen utfil ges beror den på flaggan --locale eller användarens\n" "lokalinställning. Om den är - skrivs resultatet till standard ut.\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Utdatadetaljer:\n" " -l, --locale=LL_CC sätt mållokal\n" " --no-translator antag att PO-filen är automatgenererad\n" " -w, --width=ANTAL sätt antal kolumner i resultatet\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1604,11 +1618,11 @@ msgstr "" "Hittade fler än en .pot-fil.\n" "Ange .pot-infil med flaggan --input.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "fel vid läsning av aktuell katalog" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1616,23 +1630,23 @@ msgstr "" "Hittade ingen .pot-fil i aktuell katalog.\n" "Ange .pot-infil med flaggan --input.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() misslyckades" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "I/O-fel i %s-barnprocess" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s-barnprocess terminerade med slutstatus %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1647,7 +1661,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "Svenska översättningar för paket %s" @@ -1682,7 +1696,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "varning: " @@ -1785,11 +1799,11 @@ msgstr "" "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n" "Denna version byggdes utan iconv()." -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "säkerhetskopieringstyp" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1812,7 +1826,7 @@ msgstr "" "dock bevaras punktkommentarer och filpositioner. Om en exakt likhet\n" "inte kan hittas används luddig jämförelse för att ge bättre resultat.\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1829,7 +1843,7 @@ msgstr "" " -C, --compendium=FIL ytterligare kataloger med översättningar,\n" " kan anges flera gånger\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1840,7 +1854,7 @@ msgstr "" " -U, --update updatera def.po,\n" " gör ingenting om def.po redan är aktuell\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1869,7 +1883,7 @@ msgstr "" "Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n" "miljövariabeln SIMPLE_BACKUP_SUFFIX.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1884,15 +1898,15 @@ msgstr "" " -v, --verbose öka mängden information i meddelanden\n" " -q, --quiet, --silent visa inte framstegsindikatorer\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "detta meddelande ska definiera pluralformer" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "detta meddelande ska inte definiera pluralformer" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1901,26 +1915,26 @@ msgstr "" "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld " "saknade, %ld föråldrade.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " klar.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s och explicita filnamn är ömsesidigt uteslutande" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Användning: %s [FLAGGA] [FIL]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "Konvertera en binär meddelandekatalog till en .po-fil av Uniforum-typ\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1931,7 +1945,7 @@ msgstr "" " -j, --java Javaläge: indata är en Java ResourceBundle-klass\n" " --tcl Tcl-läge: indata är en .msg-fil av tcl/msgcat-typ\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1942,7 +1956,7 @@ msgstr "" " FIL ... .mo-infiler\n" "Om ingen infil är given eller om den är - läses standard in.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1957,7 +1971,7 @@ msgstr "" "Klassnamnet härleds genom att lägga till lokalnamnet till resursnamnet\n" "avskiljt med ett understreck. Klassen söks med hjälp av CLASSPATH.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1972,7 +1986,7 @@ msgstr "" "Flaggorna -l och -d är obligatoriska. .msg-filen ligger i den givna\n" "katalogen.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1984,8 +1998,8 @@ msgstr "" " -o, --output-file=FIL skriv resultat till angiven fil\n" "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1994,6 +2008,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Resultatdetaljer:\n" @@ -2007,7 +2023,7 @@ msgstr "" " -w, --width=ANTAL sätt antal kolumner i resultatet\n" " -s, --sort-output sortera resultatet\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2020,7 +2036,7 @@ msgstr "" " -V, --version visa versionsinformation och avsluta\n" " -v, --verbose öka mängden information i meddelanden\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2042,7 +2058,7 @@ msgstr "" "översättningen. Filpositioner samlas ihop.\n" "När flaggan --unique anges kastas duplikat bort.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2198,7 +2214,7 @@ msgstr "pluralform har fel index" msgid "too many errors, aborting" msgstr "för många fel, avbryter körningen" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "ogiltig flerbytesekvens" @@ -2299,7 +2315,7 @@ msgstr "inte ett giltigt Javaklassnamn: %s" msgid "failed to create \"%s\"" msgstr "misslyckades med att skapa \"%s\"" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "fel vid skrivning till filen \"%s\"" @@ -2314,14 +2330,14 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "fel uppstod när \"%s\" öppnades för skrivning" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "" "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\"" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2334,12 +2350,12 @@ msgstr "" "som är en annan än din. Försök använda en ren ASCII-msgid istället.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "kan inte skapa utfilen \"%s\"" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standard ut" @@ -2354,7 +2370,7 @@ msgstr "%s:%d: varning: oavslutad teckenkonstant" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: varning: oavslutad sträng" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "denna fil kan inte innehålla domändirektiv" @@ -2373,26 +2389,26 @@ msgstr "%s:%d fattas tal efter #" msgid "%s:%d: invalid string expression" msgstr "%s:%d: ogiltigt strängmönster" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "--join-existing kan inte användas då resultatet skrivs till standard ut" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext måste ha nyckelord att söka efter för att fungera" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Extrahera översättbara strängar från givna infiler.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2401,7 +2417,7 @@ msgstr "" "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n" "Motsvarande gäller för frivilliga argument.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2416,7 +2432,7 @@ msgstr "" " -p, --output-dir=KATALOG utfiler placeras i katalogen KATALOG\n" "Om utfilen är - skrivs resultatet till standard ut.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2435,7 +2451,7 @@ msgstr "" " -C, --c++ samma som --language=C++\n" "I normalläge gissas språket från filändelsen på infilen.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2450,7 +2466,7 @@ msgstr "" " -c, --add-comments[=MÄRKE] skriv kommentarsblock med MÄRKE (eller de\n" " före nyckelordsrader) till resultatet\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2467,8 +2483,8 @@ msgstr "" " -T, --trigraphs hantera ANSI C treteckenssekvenser i infiler\n" " --debug mer detaljerad igenkänning av formatsträngar\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2479,6 +2495,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2506,11 +2524,11 @@ msgstr "" " -m, --msgstr-prefix[=STRÄNG] inled översatta strängar med STRÄNG eller \"\"\n" " -M, --msgstr-suffix[=STRÄNG] avsluta översatta strängar med STRÄNG eller \"\"\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standard in" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2520,7 +2538,7 @@ msgstr "" "gettext(\"\") returnerar huvudet med metainformation,\n" "inte den tomma stängen.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "språket \"%s\" okänt" diff --git a/po/tr.gmo b/po/tr.gmo index ba2869c33..3fbc7545c 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 0bf122730..b96a07c66 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-03-14 12:01+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -30,7 +30,7 @@ msgid "Valid arguments are:" msgstr "Geçerli argümanlar:" #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "\"%s\" okunmak için açılırken hata" @@ -244,11 +244,11 @@ 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/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -260,16 +260,16 @@ msgstr "" "Hiçbir garantisi yoktur; hatta SATILABÄ°LÄ°RLİĞİ veya ŞAHSÄ° KULLANIMINIZA\n" "UYGUNLUĞU için bile garanti verilmez.\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "%s tarafından yazıldı.\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "çok fazla argüman" @@ -277,11 +277,11 @@ msgstr "çok fazla argüman" msgid "missing arguments" msgstr "argümanlar eksik" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n" @@ -339,17 +339,17 @@ msgstr "" "Ancak iletiyi standart çıktıya basitçe kopyalamak yerine çevirisini verir.\n" "Standart arama dizini: %s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "" "Yazılım hatalarını adresine,\n" "Çeviri hatalarını adresine bildiriniz.\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Kullanımı: %s [SEÇENEK]\n" @@ -374,9 +374,9 @@ msgstr "" " içerir\n" " -i, --ip-address makinanın IP adresi\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -391,28 +391,28 @@ msgstr "" msgid "could not get host name" msgstr "makina ismi alınamadı" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "en fazla bir girdi dosyasına izin var" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ile %s bağdaşmıyor" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Kullanımı: %s [SEÇENEK] [GÄ°RDÄ°DOSYASI]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" @@ -421,15 +421,15 @@ msgstr "" "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n" "ve özellikleri uygular.\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -442,8 +442,8 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N Girdi dosyalarının arama yoluna DÄ°ZÄ°Ni ekler\n" "Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -456,7 +456,7 @@ msgstr "" "Çıktı dosyası verilmemişse ya da yerine - verilmişse sonuçlar standart\n" "çıktıya yazılır.\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -475,7 +475,7 @@ msgstr "" " --no-obsolete eski #~ iletileri silinir.\n" " --only-obsolete eski #~ iletileri tutulur.\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -494,8 +494,8 @@ msgstr "" " --fuzzy --only-fuzzy --clear-fuzzy için kısaltma\n" " --obsolete --only-obsolete --clear-obsolete için kısaltma\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -506,6 +506,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -522,17 +524,17 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Kullanımı: %s [SEÇENEK] [GÄ°RDÄ°DOSYASI]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -556,7 +558,7 @@ msgstr "" "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n" "alınır.\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -571,7 +573,7 @@ msgstr "" " -D, --directory=DÄ°ZÄ°N girdi dosyalarının arama yoluna DÄ°ZÄ°N eklenir\n" "Girdi dosyası - ise standart girdi okunur.\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -583,7 +585,7 @@ msgstr "" " -o, --output-file=DOSYA çıktı DOSYAya yazılır\n" "Çıktı dosyası verilmezse ya da - verilirse sonuçlar standart çıktıya yazılır.\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -605,8 +607,8 @@ msgstr "" " -u, --unique --less-than=2 için kısaltma, sadece tek olan\n" " iletiler gösterilir\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -620,6 +622,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -639,7 +643,7 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -650,15 +654,15 @@ msgstr "" " -h, --help Bu yardımı gösterir ve çıkar\n" " -V, --version Sürüm bilgilerini gösterir ve çıkar\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "hiçbir girdi dosyası verilmemiş" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "tam olarak 2 girdi dosyası gerekli" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Kullanımı: %s [SEÇENEK] def.po ref.pot\n" @@ -693,7 +697,7 @@ msgstr "" " dosya\n" " -D, --directory=DÄ°ZÄ°N girdi dosyaları arama yoluna eklenecek DÄ°ZÄ°N\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -702,15 +706,15 @@ msgstr "" "İşlem seçenekleri:\n" " -m, --multi-domain ref.pot'u tüm def.po dosyalarına uygular\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "bu ileti kullanıldı ama tanımlı değil..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...ama bu tanımlama benzer" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "bu ileti kullanıldı ama %s'de tanımlı değil" @@ -734,11 +738,11 @@ msgstr "ileti iki defa tanımlanmış" msgid "...this is the location of the first definition" msgstr "...bu ilk tanımlamanın konumu" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "en az iki dosya belirtilmelidir" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -760,7 +764,7 @@ msgstr "" "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n" "korunmuş olacaktır.\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -782,8 +786,8 @@ msgstr "" " -u, --unique --less-than=2 için kısaltma, sadece tek olan\n" " iletiler gösterilir\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -794,6 +798,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -812,12 +818,12 @@ msgstr "" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" " --omit-header `msgid \"\"' şeklindeki başlığı yazmaz\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "Bir çeviri kataloğunu başka bir karakter kodlamasına dönüştürür.\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -828,8 +834,8 @@ msgstr "" " -t, --to-code=Ä°SÄ°M çıktı için kodlama belirtilir\n" "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -840,6 +846,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -856,20 +864,20 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "hiç girdi dosyası verilmemiş" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "tam olarak 1 girdi dosyası gerekli" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Kullanımı: %s [SEÇENEK] GÄ°RDÄ°DOSYASI\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -882,7 +890,7 @@ msgstr "" "PO Şablon dosyasıdır. Çevirisiz girdilere msgid ile uyuşan bir çeviri\n" "yerleştirilir ve fuzzy olarak imlenir.\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -928,7 +936,7 @@ msgstr "" "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n" "çıktılar. \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -945,30 +953,30 @@ msgstr "" msgid "write to stdout failed" msgstr "standart çıktıya yazılamadı" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "%s alt sürecine yazılamadı" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "süzgeç ismi eksik" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "en az bir sed betiği belirtilmelidir" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Kullanımı: %s [SEÇENEK] SÜZGEÇ [SÜZGEÇ-SEÇENEĞİ]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -977,7 +985,7 @@ msgstr "" "SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n" "standart çıktıya yazabilen herhangi bir programdır.\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -992,8 +1000,8 @@ msgstr "" " içeriğini ekler\n" " -n, --quiet, --silent standart çıktı iletilerini engeller\n" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1005,6 +1013,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -1022,22 +1032,22 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "%s alt süreci ile haberleşilemedi" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "%s alt sürecinden okunamadı" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı" @@ -1047,18 +1057,18 @@ msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı" msgid "the argument to %s should be a single punctuation character" msgstr "%s argümanı bir noktalama işareti olmalıydı" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s sadece %s ile geçerlidir" @@ -1410,12 +1420,12 @@ 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:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "'%c' seçeneği 'K' ya da 'T' belirtilmeden önce kullanılamaz" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -1424,7 +1434,7 @@ msgstr "" "Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n" "bir çeviri kataloğunun tüm iletilerini çıkarır.\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1481,8 +1491,8 @@ msgstr "" " -f, --file=DOSYA KALIP, DOSYAdan sağlanır\n" " -i, --ignore-case harf büyüklükleri fark olarak algılanmaz\n" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1493,6 +1503,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1509,11 +1521,11 @@ msgstr "" " -s, --sort-output çıktıyı sıralı üretir\n" " -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "grep alt sürecine yazılamadı" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1523,7 +1535,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:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1534,19 +1546,19 @@ 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:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "%s oluşturuldu.\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, 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:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1559,7 +1571,7 @@ msgstr "" "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n" "- verilmişse standart girdi okunur.\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1572,20 +1584,22 @@ 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:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "Çıktı ayrıntıları:\n" " -l, --locale=tr_TR hedef yerel belirtilir\n" " --no-translator PO dosyasının otomatik üretildiği varsayılır\n" " -w, --width=SAYI sayfa genişliği SAYIya ayarlanır\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1594,11 +1608,11 @@ msgstr "" "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile " "belirtin.\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "dizin okunurken hata" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1607,23 +1621,23 @@ msgstr "" "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile " "belirtin.\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() başarısız" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s alt süreci G/Ç hatası" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, 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:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1638,7 +1652,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "%s paketi için Türkçe çeviriler" @@ -1674,7 +1688,7 @@ 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:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "uyarı: " @@ -1777,11 +1791,11 @@ 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:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "yedekleme türü" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1804,7 +1818,7 @@ 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:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1821,7 +1835,7 @@ msgstr "" " -C, --compendium=DOSYA ileti çevirilerinin birden fazlasını içerebilen\n" " ek veritabanı\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1832,7 +1846,7 @@ msgstr "" " -U, --update def.po dosyasını günceller,\n" " def.po zaten güncelse bir şey yapmaz\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1862,7 +1876,7 @@ msgstr "" "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n" "belirtilmedikçe yedekleme dosyasının soneki `~' dir.\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1877,15 +1891,15 @@ msgstr "" " -v, --verbose sonuçlar daha ayrıntılı verilir\n" " -q, --quiet, --silent bilgi verilmez\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr ".bu ileti çoğul biçem olmalıydı" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "bu ileti çoğul biçem olmamalıydı" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1894,26 +1908,26 @@ msgstr "" "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık " "kullanılmayan ileti okundu.\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " bitti.\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "%s ile diğer dosya isimleri bağdaşmıyor" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Kullanımı: %s [SEÇENEK] [DOSYA]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "Ä°kilik ileti kataloğunu Uniforum tarzı .po dosyasına dönüştürür.\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1924,7 +1938,7 @@ msgstr "" " -j, --java Java kipi: girdi bir Java ÖzkaynakPaketi sınıfıdır\n" " --tcl Tcl kipi:, girdi bir tcl/iletiKat .msg dosyasıdır\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1935,7 +1949,7 @@ msgstr "" " DOSYA ... .mo girdi dosyaları\n" "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1950,7 +1964,7 @@ msgstr "" "Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n" "saptanır. Sınıf, CLASSPATH ortam değişkeni ile konumlanır.\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1964,7 +1978,7 @@ msgstr "" " -d DÄ°ZÄ°N .msg ileti kataloglarının bulunduğu ana dizin\n" ".msg dosyası DÄ°ZÄ°Nde bulunduğundan -d ve -l seçenekleri zorunludur.\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1976,8 +1990,8 @@ msgstr "" " -o, --output-file=DOSYA çıktı belirtilen DOSYAya yazılır\n" "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1986,6 +2000,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "Çıktı ayrıntıları:\n" @@ -1997,7 +2013,7 @@ msgstr "" " -w, --width=SAYI sayfa genişliği SAYIya ayarlanır\n" " -s, --sort-output çıktıyı sıralı üretir\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -2010,7 +2026,7 @@ msgstr "" " -V, --version Sürüm bilgilerini gösterir ve çıkar\n" " -v, --verbose sonuçlar daha ayrıntılı verilir\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -2031,7 +2047,7 @@ msgstr "" "onlar ilk çeviriden alınır. Dosya konumları korunur. --unique seçeneği\n" "kullanıldığında tekrarlananlar iptal edilir.\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2185,7 +2201,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:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "çoklu bayt dizisi geçersiz" @@ -2286,7 +2302,7 @@ msgstr "Geçerli bir Java sınıfı ismi değil: %s" msgid "failed to create \"%s\"" msgstr "\"%s\" oluşturulamadı" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "\"%s\" dosyasına yazarken hata" @@ -2302,13 +2318,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "\"%s\" yazılmak için açılırken hata" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2321,12 +2337,12 @@ msgstr "" "olabilir. Salt ASCII msgid kullanmanız önerilir.\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "\"%s\" çıktı dosyası oluşturulamıyor" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "standart çıktı" @@ -2341,7 +2357,7 @@ msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti" msgid "%s:%d: warning: unterminated string literal" msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "bu dosya paket yönergelerini içermeyebilir" @@ -2360,25 +2376,25 @@ msgstr "%s:%d: # dan sonra sayı yok" msgid "%s:%d: invalid string expression" msgstr "%s:%d: dizge ifade geçersiz" -#: src/xgettext.c:397 +#: src/xgettext.c:401 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:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "xgettext anahtar sözcükler olmaksızın bulamaz" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, 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:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -2387,7 +2403,7 @@ msgstr "" "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n" "Benzer durum seçimlik argümanlar içinde geçerlidir.\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2403,7 +2419,7 @@ msgstr "" " -p, --output-dir=DÄ°ZÄ°N çıktı dosyaları DÄ°ZÄ°Ne konulacaktır.\n" "Çıktı dosyası olarak - verilmişse çıktı standart çıktıya yazılır.\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2421,7 +2437,7 @@ msgstr "" " -C, --c++ --language=C++ için kısaltma\n" "Dil öntanımlı olarak girdi dosyasının uzantısına göre seçilir.\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2435,7 +2451,7 @@ msgstr "" " -x, --exclude-file=DOSYA.po DOSYA.po dosyasındaki iletiler çıkartılmaz\n" " -c, --add-comments[=ETÄ°TET] ETÄ°KETli yorum bloğunu çıktı dosyasına yazar\n" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2454,8 +2470,8 @@ msgstr "" " --debug biçem dizgesi tanıması ile ilgili daha fazla\n" " ayrıntı verilir.\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2466,6 +2482,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2495,11 +2513,11 @@ msgstr "" " -M, --msgstr-suffix[=DÄ°ZGE] msgstr girdileri için sonek olarak DÄ°ZGE ya da\n" " \"\" kullanılır\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "standart girdi" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2509,7 +2527,7 @@ msgstr "" "gettext(\"\") ile başlık girdilerindeki bilgileri\n" "döndürür. Boş dizge değildir.\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "dil `%s' bilinmiyor" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo new file mode 100644 index 000000000..e9510013d Binary files /dev/null and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 74ab0814d..dad572ff3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.1\n" -"POT-Creation-Date: 2002-03-06 15:21+0100\n" +"POT-Creation-Date: 2002-04-24 19:27+0200\n" "PO-Revision-Date: 2002-04-14 09:16 +0800\n" "Last-Translator: Pofeng Lee \n" "Language-Team: Chinese (traditional) \n" @@ -32,7 +32,7 @@ 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 #: 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 +#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852 #, c-format msgid "error while opening \"%s\" for reading" msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³ÆŪ¨ú®Éµo¥Í¿ù»~" @@ -236,11 +236,11 @@ msgid "" "format specifications in 'msgid' and '%s' for argument '%s' are not the same" msgstr "¡¥msgid¡¦©M¡¥%s¡¦ªº°Ñ¼Æ¡¥%s¡¦ªº®æ¦¡¨Ã¤£¬Û¦P" -#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229 -#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170 -#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286 -#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207 -#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374 +#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234 +#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176 +#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291 +#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 +#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378 #, c-format, no-wrap msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -251,16 +251,16 @@ msgstr "" "³o¬O¦Û¥Ñ³nÅé¡F½Ð°Ñ¦Ò­ì©l½Xªºª©ÅvÁn©ú¡C¥»³nÅ餣´£¨Ñ¥ô¦ó«OÃÒ¡A¬Æ¦Ü¤£·|¥]¬A\n" "¥i°â©Ê©M¾A¥Î©ó¥ô¦ó¯S©w¥Øªºªº«OÃÒ¡C\n" -#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234 -#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175 -#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291 -#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212 -#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379 +#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239 +#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181 +#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296 +#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217 +#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383 #, c-format msgid "Written by %s.\n" msgstr "¥Ñ %s ½s¼g¡C\n" -#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143 +#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143 msgid "too many arguments" msgstr "°Ñ¼Æ¹L¦h" @@ -268,11 +268,11 @@ msgstr " msgid "missing arguments" msgstr "¯Ê¤Ö¤F°Ñ¼Æ" -#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290 -#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226 -#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397 -#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269 -#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525 +#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295 +#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232 +#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402 +#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274 +#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "¸Õ¸Õ¡¥%s --help¡¦¨ÓÀò¨ú§ó¦h¸ê°T¡C\n" @@ -330,15 +330,15 @@ msgstr "" "¦Ó¬O´M§ä°T®§¸ê®ÆÀɸ̽Ķ¹Lªº°T®§¡C\n" "¼Ð·Çªº·j´M¥Ø¿ý¬°¡G%s\n" -#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371 -#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286 -#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485 -#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343 -#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620 +#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378 +#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294 +#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492 +#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350 +#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626 msgid "Report bugs to .\n" msgstr "½Ð¦^³ø¿ù»~¦Ü ¡C\n" -#: src/hostname.c:206 src/msginit.c:347 +#: src/hostname.c:206 src/msginit.c:352 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "¥Îªk¡G%s [¿ï¶µ]\n" @@ -362,9 +362,9 @@ msgstr "" " -f, --fqdn, --long ªøªº¥D¾÷¦WºÙ¡A¥]¬A¥¿¦¡ªººô°ì¦WºÙ¡]FQDN¡^¤Î§O¦W\n" " -i, --ip-address ¥D¾÷ªº IP ¦a§}\n" -#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299 -#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479 -#: src/msginit.c:387 src/urlget.c:180 +#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307 +#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486 +#: src/msginit.c:394 src/urlget.c:180 #, no-wrap msgid "" "Informative output:\n" @@ -379,43 +379,43 @@ msgstr "" msgid "could not get host name" msgstr "µLªk¨ú±o¥D¾÷¦WºÙ" -#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198 -#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227 +#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199 +#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232 msgid "at most one input file allowed" msgstr "³Ì¦h¥u¤¹³\¤@­Ó¿é¤JÀÉ" -#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248 -#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212 -#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272 -#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312 -#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320 -#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389 -#: src/xgettext.c:393 +#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253 +#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218 +#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277 +#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317 +#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325 +#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393 +#: src/xgettext.c:397 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s ©M %s ¨âªÌ¬O¤¬¤£¬Û®eªº" -#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274 +#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]\n" -#: src/msgattrib.c:332 +#: src/msgattrib.c:337 #, no-wrap msgid "" "Filters the messages of a translation catalog according to their attributes,\n" "and manipulates the attributes.\n" msgstr "®Ú¾Ú°T®§ªºÄݩʹLÂo½ĶÀɸ̪ºÂ½Ä¶±ø¥Ø¡A¨Ã³B²z°T®§ªºÄÝ©Ê¡C\n" -#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328 -#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361 -#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403 -#: src/msgunfmt.c:324 src/msguniq.c:291 +#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333 +#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366 +#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408 +#: src/msgunfmt.c:329 src/msguniq.c:296 #, no-wrap msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "ªø¿ï¶µ¥²¶·¥Îªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²¶·ªº¡C\n" -#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296 +#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301 #, no-wrap msgid "" "Input file location:\n" @@ -428,8 +428,8 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¨S¦³«ü©w¿é¤JÀɩοé¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374 -#: src/msggrep.c:426 src/msgmerge.c:425 +#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379 +#: src/msggrep.c:431 src/msgmerge.c:430 #, no-wrap msgid "" "Output file location:\n" @@ -441,7 +441,7 @@ msgstr "" " -o, --output-file=ÀÉ®× ±N¿é¥X¼g¤J¦Ü«ü©wªºÀÉ®×\n" "¦pªG¨S¦³«ü©w¿é¥XÀɩοé¥XÀɬO¡¥-¡¦¡A«h·|±Nµ²ªG¼g¤J¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msgattrib.c:359 +#: src/msgattrib.c:364 #, no-wrap msgid "" "Message selection:\n" @@ -460,7 +460,7 @@ msgstr "" " --no-obsolete ²¾°£¹L®É #~ ªº°T®§\n" " --only-obsolete «O¯d¹L®É #~ ªº°T®§\n" -#: src/msgattrib.c:370 +#: src/msgattrib.c:375 #, no-wrap msgid "" "Attribute manipulation:\n" @@ -479,8 +479,8 @@ msgstr "" " --fuzzy µ¥©ó --only-fuzzy --clear-fuzzy\n" " --obsolete µ¥©ó --only-obsolete --clear-obsolete\n" -#: src/msgattrib.c:381 -#, no-wrap +#: src/msgattrib.c:386 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -491,6 +491,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -506,17 +508,17 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgcat.c:254 src/msgcomm.c:277 +#: src/msgcat.c:259 src/msgcomm.c:282 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "¤£¥i¯à¥X²{ªº¿ï¾Ü±ø¥ó (%d < n <%d)" -#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530 +#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534 #, c-format, no-wrap msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [¿é¤JÀÉ]...\n" -#: src/msgcat.c:300 +#: src/msgcat.c:305 #, no-wrap msgid "" "Concatenates and merges the specified PO files.\n" @@ -537,7 +539,7 @@ msgstr "" "--use-first ¿ï¶µ¡A¨º¼Ë«h·|¥Ñ²Ä¤@­Ó§t¦³¸Ó½Ķ±ø¥ØªºÀɮרú±o¸ê®Æ¡C\n" "©Ò¦³ PO Àɤ¤ªºÂ½Ä¶±ø¥ØªºÀɮצì¸m³£·|²Ö¿n¤U¨Ó¡C\n" -#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546 +#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550 #, no-wrap msgid "" "Input file location:\n" @@ -552,7 +554,7 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304 +#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309 #, no-wrap msgid "" "Output file location:\n" @@ -564,7 +566,7 @@ msgstr "" " -o, --output-file=ÀÉ®× ±N¿é¥X¼g¤J¦Ü«ü©wªºÀÉ®×\n" "¦pªG¨S¦³«ü©w¿é¥XÀɩοé¥XÀɬO¡¥-¡¦¡A«h·|±Nµ²ªG¼g¤J¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msgcat.c:335 +#: src/msgcat.c:340 #, no-wrap msgid "" "Message selection:\n" @@ -584,8 +586,8 @@ msgstr "" " -u, --unique --less-than=2 ªºÁY¼g¡A­n¨D¥u¦L¥X¥X²{¤@¦¸\n" " ªº°T®§\n" -#: src/msgcat.c:347 src/msguniq.c:319 -#, no-wrap +#: src/msgcat.c:352 src/msguniq.c:324 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -t, --to-code=NAME encoding for output\n" @@ -599,6 +601,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -617,7 +621,7 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614 +#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620 #, no-wrap msgid "" "Informative output:\n" @@ -628,15 +632,15 @@ msgstr "" " -h, --help Åã¥Ü¦¹¬q»¡©ú¨ÃÂ÷¶}\n" " -V, --version Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n" -#: src/msgcmp.c:149 src/msgmerge.c:281 +#: src/msgcmp.c:149 src/msgmerge.c:286 msgid "no input files given" msgstr "¥¼«ü©w¿é¤JÀÉ" -#: src/msgcmp.c:154 src/msgmerge.c:286 +#: src/msgcmp.c:154 src/msgmerge.c:291 msgid "exactly 2 input files required" msgstr "»Ý­n«ê¦n«ü©w¨â­Ó¿é¤JÀÉ" -#: src/msgcmp.c:175 src/msgmerge.c:385 +#: src/msgcmp.c:175 src/msgmerge.c:390 #, c-format, no-wrap msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "¥Îªk¡G%s [¿ï¶µ] def.po ref.pot\n" @@ -670,7 +674,7 @@ msgstr "" " ref.pot ½Ķ¨Ó·½ÀÉ\n" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" -#: src/msgcmp.c:203 src/msgmerge.c:449 +#: src/msgcmp.c:203 src/msgmerge.c:454 #, no-wrap msgid "" "Operation modifiers:\n" @@ -679,15 +683,15 @@ msgstr "" "¾Þ§@¼Ò¦¡¡G\n" " -m, --multi-domain ±N ref.pot ®M¥Î©ó def.po ¤¤ªº¨C¤@­Ó»â°ì\n" -#: src/msgcmp.c:252 src/msgmerge.c:848 +#: src/msgcmp.c:252 src/msgmerge.c:855 msgid "this message is used but not defined..." msgstr "³o­Ó°T®§¦³¨Ï¥Î¹L¦ý¨S¦³©w¸q..." -#: src/msgcmp.c:254 src/msgmerge.c:850 +#: src/msgcmp.c:254 src/msgmerge.c:857 msgid "...but this definition is similar" msgstr "...¦ý³o­Ó©w¸q¸û¬Û¦ü" -#: src/msgcmp.c:259 src/msgmerge.c:877 +#: src/msgcmp.c:259 src/msgmerge.c:884 #, c-format msgid "this message is used but not defined in %s" msgstr "³o­Ó°T®§¦³¨Ï¥Î¹L¦ý¦b %s ¤¤¨S¦³©w¸q" @@ -710,11 +714,11 @@ msgstr " msgid "...this is the location of the first definition" msgstr "...³o¬O²Ä¤@¦¸©w¸qªº¦ì¸m" -#: src/msgcomm.c:266 +#: src/msgcomm.c:271 msgid "at least two files must be specified" msgstr "¥²¶·«ü©w¦Ü¤Ö¨â­ÓÀÉ®×" -#: src/msgcomm.c:316 +#: src/msgcomm.c:321 #, no-wrap msgid "" "Find messages which are common to two or more of the specified PO files.\n" @@ -732,7 +736,7 @@ msgstr "" "°T®§¡^¡C½Ķ¤º®e¡B¦Û¦æ¥[¤Wªºµù¸Ñ©M·½µ{¦¡½Xªºµù¸Ñ³£·|«O¯d¡A¦ý¥u·|¥Ñ²Ä¤@­Ó\n" "§t¦³¸Ó½Ķ±ø¥ØªºÀɮרú±o¡C©Ò¦³ PO Àɤ¤ªºÂ½Ä¶±ø¥ØªºÀɮצì¸m³£·|²Ö¿n¤U¨Ó¡C\n" -#: src/msgcomm.c:350 +#: src/msgcomm.c:355 #, no-wrap msgid "" "Message selection:\n" @@ -751,8 +755,8 @@ msgstr "" " -u, --unique --less-than=2 ªºÁY¼g¡A­n¨D¥u¦L¥X¥X²{¤@¦¸\n" " ªº°T®§\n" -#: src/msgcomm.c:362 -#, no-wrap +#: src/msgcomm.c:367 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -763,6 +767,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -780,12 +786,12 @@ msgstr "" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" " --omit-header ¤£¼g¤J§t¦³¡¥msgid \"\"¡¦Äæ¦ìªºÀÉÀY\n" -#: src/msgconv.c:251 +#: src/msgconv.c:257 #, no-wrap msgid "Converts a translation catalog to a different character encoding.\n" msgstr "±N¤@­Ó½ĶÀɪº½s½XÂà´«¬°¥t¤@ºØ¤å¦r½s½X¡C\n" -#: src/msgconv.c:277 +#: src/msgconv.c:283 #, no-wrap msgid "" "Conversion target:\n" @@ -796,8 +802,8 @@ msgstr "" " -t, --to-code=¦WºÙ ¿é¥Xªº½s½X\n" "¹w³]ªº½s½X¬°¥Ø«e»y¨tªº½s½X¡C\n" -#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455 -#, no-wrap +#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -808,6 +814,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -823,20 +831,20 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410 +#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414 msgid "no input file given" msgstr "¥¼«ü©w¿é¤JÀÉ" -#: src/msgen.c:191 +#: src/msgen.c:197 msgid "exactly one input file required" msgstr "»Ý­n«ê¦n«ü©w¤@­Ó¿é¤JÀÉ" -#: src/msgen.c:231 +#: src/msgen.c:237 #, c-format, no-wrap msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "¥Îªk¡G%s [¿ï¶µ] ¿é¤JÀÉ\n" -#: src/msgen.c:236 +#: src/msgen.c:242 #, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -847,7 +855,7 @@ msgstr "" "²£¥Í­^¤å½ĶÀÉ¡C¿é¤JÀÉ¥i¥H¬O PO ÀÉ©Î POT ÀÉ(³q±`¥Ñ xgettext ²£¥Í)¡C\n" "¥¼Â½Ä¶ªº±ø¥Ø·|¶ñ¤W©M msgid ¤@¼Ëªº¦r¦ê¡A¨Ã¼Ð°O¬°¼Ò½k½Ķ¡C\n" -#: src/msgen.c:249 +#: src/msgen.c:255 #, no-wrap msgid "" "Input file location:\n" @@ -893,7 +901,7 @@ msgstr "" "¦³¤@­ÓºÙ¬° '0' ªº¯S®í¤º¸m«ü¥O¡A¥¦·|¿é¥X©Ò¦³Â½Ä¶±ø¥Ø¡A¨ÃÀH«á¥[¤W null ¦ì¤¸¡C\n" "¡§msgexec 0¡¨ªº¿é¥X¾A¥Î©ó§@¬°¡§xargs -0¡¨ªº¿é¤J¡C\n" -#: src/msgexec.c:253 src/msgfilter.c:366 +#: src/msgexec.c:253 src/msgfilter.c:371 #, no-wrap msgid "" "Input file location:\n" @@ -910,30 +918,30 @@ msgstr "" msgid "write to stdout failed" msgstr "¼g¤J¦Ü¼Ð·Ç¿é¥X®Éµo¥Í¿ù»~" -#: src/msgexec.c:337 src/msgfilter.c:603 +#: src/msgexec.c:337 src/msgfilter.c:610 #, c-format msgid "write to %s subprocess failed" msgstr "¼g¤J¦Ü %s °Æµ{§Ç®Éµo¥Í¿ù»~" -#: src/msgfilter.c:263 +#: src/msgfilter.c:268 msgid "missing filter name" msgstr "¥¼«ü©w¹LÂo¾¹" -#: src/msgfilter.c:287 +#: src/msgfilter.c:292 msgid "at least one sed script must be specified" msgstr "¥²¶·«ü©w¦Ü¤Ö¤@­Ó sed script" -#: src/msgfilter.c:351 +#: src/msgfilter.c:356 #, c-format, no-wrap msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "¥Îªk¡G%s [¿ï¶µ] ¹LÂo¾¹ [¹LÂo¾¹¿ï¶µ]\n" -#: src/msgfilter.c:356 +#: src/msgfilter.c:361 #, no-wrap msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "¹ï©ó½ĶÀɤ¤ªº©Ò¦³Â½Ä¶±ø¥Ø¶i¦æ¹LÂo¡C\n" -#: src/msgfilter.c:382 +#: src/msgfilter.c:387 #, no-wrap msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -942,7 +950,7 @@ msgstr "" "<¹LÂo¾¹>¥i¥H¬O¥ô¦ó¥Ñ¼Ð·Ç¿é¤JŪ¤J½Ķ±ø¥Ø\n" "¨Ã±N­×§ï«áªºÂ½Ä¶¼g¶i¼Ð·Ç¿é¥Xªºµ{¦¡¡C\n" -#: src/msgfilter.c:388 +#: src/msgfilter.c:393 #, no-wrap msgid "" "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" @@ -952,8 +960,8 @@ msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" msgstr "" -#: src/msgfilter.c:397 -#, no-wrap +#: src/msgfilter.c:402 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -965,6 +973,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" msgstr "" @@ -981,22 +991,22 @@ msgstr "" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " -F, --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msgfilter.c:555 +#: src/msgfilter.c:562 #, c-format msgid "cannot set up nonblocking I/O to %s subprocess" msgstr "µLªk©M %s °Æµ{§Ç«Ø¥ß«D±M¥Îªº I/O" -#: src/msgfilter.c:583 +#: src/msgfilter.c:590 #, c-format msgid "communication with %s subprocess failed" msgstr "©M %s °Æµ{§Ç·¾³q®É¥X²{¿ù»~" -#: src/msgfilter.c:634 +#: src/msgfilter.c:641 #, c-format msgid "read from %s subprocess failed" msgstr "¥Ñ %s °Æµ{§ÇŪ¤J¸ê®Æ®É¥X²{¿ù»~" -#: src/msgfilter.c:650 +#: src/msgfilter.c:657 #, c-format msgid "%s subprocess terminated with exit code %d" msgstr "%s °Æµ{§Ç¤w²×¤î¡A¿ù»~½X¬° %d" @@ -1006,18 +1016,18 @@ msgstr "%s msgid "the argument to %s should be a single punctuation character" msgstr "%s ªº°Ñ¼ÆÀ³¸Ó¬O¤@­Ó¼ÐÂI²Å¸¹" -#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243 +#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s »Ý­n«ü©w¡§-d ¥Ø¿ý¡¨¿ï¶µ" -#: src/msgfmt.c:400 src/msgunfmt.c:236 +#: src/msgfmt.c:400 src/msgunfmt.c:241 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s »Ý­n«ü©w¡§-l locale¡¨¿ï¶µ" -#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252 -#: src/msgunfmt.c:258 +#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257 +#: src/msgunfmt.c:263 #, c-format msgid "%s is only valid with %s" msgstr "%s ¥u¯à©M %s °t¦X¤@°_¨Ï¥Î¤~¦³®Ä" @@ -1360,19 +1370,19 @@ msgstr " msgid "%s: warning: source file contains fuzzy translation" msgstr "%s¡Gĵ§i¡G­ì©lÀÉ¥]§t¼Ò½k½Ķ±ø¥Ø" -#: src/msggrep.c:385 +#: src/msggrep.c:390 #, c-format msgid "option '%c' cannot be used before 'K' or 'T' has been specified" msgstr "¥¼«ü©w¡¥K¡¦©Î¡¥T¡¦«e¤£¯à¨Ï¥Î¿ï¶µ¡¥%c¡¦" -#: src/msggrep.c:407 +#: src/msggrep.c:412 #, 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 "©â¨ú½ĶÀɤ¤ªº°T®§¡A¦Ó³o¨Ç°T®§²Å¦X¬YºØ¼Ë¦¡©ÎÄÝ©ó¬Y­Ó«ü©wªº¨Ó·½ÀÉ¡C\n" -#: src/msggrep.c:434 +#: src/msggrep.c:439 #, no-wrap msgid "" "Message selection:\n" @@ -1403,8 +1413,8 @@ msgid "" " -i, --ignore-case ignore case distinctions\n" msgstr "" -#: src/msggrep.c:464 -#, no-wrap +#: src/msggrep.c:469 +#, fuzzy, no-wrap msgid "" "Output details:\n" " --no-escape do not use C escapes in output (default)\n" @@ -1415,6 +1425,8 @@ msgid "" " --add-location preserve '#: filename:line' lines (default)\n" " --strict strict Uniforum output style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " --sort-output generate sorted output\n" " --sort-by-file sort output by file location\n" msgstr "" @@ -1430,11 +1442,11 @@ msgstr "" " --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" " --sort-by-file ®Ú¾ÚÀɮצì¸m¶i¦æ±Æ§Ç\n" -#: src/msggrep.c:554 +#: src/msggrep.c:561 msgid "write to grep subprocess failed" msgstr "¼g¤J¦Ü grep °Æµ{§Ç®É¥X²{¿ù»~" -#: src/msginit.c:279 +#: src/msginit.c:284 msgid "" "You are in a language indifferent environment. Please set\n" "your LANG environment variable, as described in the ABOUT-NLS\n" @@ -1443,7 +1455,7 @@ msgstr "" "¨t²ÎÀô¹Ò¨S¦³¥ô¦ó©M»y¨¥¦³Ãöªº³]©w¡C½Ð®Ú¾Ú ABOUT-NLS Àɮשҭz¡A\n" "³]©w LANG Àô¹ÒÅܼơC³o¬O´ú¸Õ½Ķ®Éªº¥²­n¨BÆJ¡C\n" -#: src/msginit.c:307 +#: src/msginit.c:312 #, c-format msgid "" "Output file %s already exists.\n" @@ -1454,19 +1466,19 @@ msgstr "" "½Ð³z¹L --locale ¿ï¶µ«ü©w»y¨t©Î\n" "--output-file ¿ï¶µ«ü©w¿é¥Xªº .po ÀÉ¡C\n" -#: src/msginit.c:330 +#: src/msginit.c:335 #, c-format msgid "Created %s.\n" msgstr "¤w«Ø¥ß %s¡C\n" -#: src/msginit.c:352 +#: src/msginit.c:357 #, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from the\n" "user's environment.\n" msgstr "«Ø¥ß·sªº PO ÀÉ¡A¨Ã¥Ñ¨Ï¥ÎªÌÀô¹Ò¨ú±oªì©l¤Æ©Ò»ÝªºÀÉÀY¸ê®Æ¡C\n" -#: src/msginit.c:363 +#: src/msginit.c:368 #, no-wrap msgid "" "Input file location:\n" @@ -1479,7 +1491,7 @@ msgstr "" "¦pªG¨S¦³«ü©w¿é¤JÀÉ¡A·|¦b¥Ø«eªº¥Ø¿ý·j´M POT ÀÉ¡C\n" "¦pªG¿é¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msginit.c:371 +#: src/msginit.c:376 #, no-wrap msgid "" "Output file location:\n" @@ -1492,20 +1504,22 @@ msgstr "" "¦pªG¨S¦³«ü©w¿é¥XÀÉ¡A¿é¥XÀɪº¦WºÙ±N·|¥Ñ --locale ¿ï¶µ©Î¬O¨Ï¥ÎªÌªº»y¨t¨M©w¡C\n" "¦pªG¿é¥XÀɬO¡¥-¡¦¡A«h·|±Nµ²ªG¼g¤J¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msginit.c:379 -#, no-wrap +#: src/msginit.c:384 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -l, --locale=LL_CC set target locale\n" " --no-translator assume the PO file is automatically generated\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" msgstr "" "¿é¥X²Ó¸`¡G\n" " -l, --locale=LL_CC ³]©w¥Ø¼Ð»y¨t\n" " --no-translator °²³] PO ÀɬO¦Û°Ê²£¥Íªº\n" " -w, --width=¼Æ¦r ³]©w¿é¥Xªº¼e«×\n" -#: src/msginit.c:430 +#: src/msginit.c:437 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -1513,11 +1527,11 @@ msgstr "" "§ä¨ì¦h©ó¤@­Óªº .pot ÀÉ¡C\n" "½Ð³z¹L --input ¿ï¶µ«ü©w§@¬°¿é¤JÀɪº .pot ÀÉ¡C\n" -#: src/msginit.c:438 src/msginit.c:443 +#: src/msginit.c:445 src/msginit.c:450 msgid "error reading current directory" msgstr "Ū¨ú¥Ø«eªº¥Ø¿ý®Éµo¥Í¿ù»~" -#: src/msginit.c:451 +#: src/msginit.c:458 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -1525,23 +1539,23 @@ msgstr "" "¦b¥Ø«e¥Ø¿ý¤¤§ä¤£¨ì¥ô¦ó .pot ÀÉ¡C\n" "½Ð³z¹L --input ¿ï¶µ«ü©w§@¬°¿é¤JÀɪº .pot ÀÉ¡C\n" -#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155 +#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165 #: src/read-java.c:80 msgid "fdopen() failed" msgstr "fdopen() ¥¢±Ñ" -#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093 +#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103 #, c-format msgid "%s subprocess I/O error" msgstr "%s °Æµ{§Ç¿é¥X/¿é¤J¿ù»~" -#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169 +#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179 #: src/read-java.c:90 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "%s °Æµ{§Ç¥¢±Ñ¡A¿ù»~½X¬° %d" -#: src/msginit.c:1078 +#: src/msginit.c:1088 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -1555,7 +1569,7 @@ msgstr "" #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1422 +#: src/msginit.c:1432 #, c-format msgid "English translations for %s package" msgstr "traditional Chinese translation for %s" @@ -1589,7 +1603,7 @@ msgid "target charset \"%s\" is not a portable encoding name." msgstr "¥Ø¼Ðªº¦r¤¸¶°½s½X¡§%s¡¨¤£¬O³q¥Îªº½s½X¦WºÙ¡C" #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851 +#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863 msgid "warning: " msgstr "ĵ§i¡G" @@ -1689,11 +1703,11 @@ msgstr "" "¤£¤ä´©±N¦r¤¸¶°¥Ñ¡§%s¡¨Âà´«¦Ü¡§%s¡¨¡C%s »Ý­n iconv()¡A\n" "¦ý½sĶ¦¹µ{¦¡®É¨S¦³ iconv() ¤ä´©¡C" -#: src/msgmerge.c:353 +#: src/msgmerge.c:358 msgid "backup type" msgstr "³Æ¥÷¤è¦¡" -#: src/msgmerge.c:390 +#: src/msgmerge.c:395 #, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -1713,7 +1727,7 @@ msgstr "" "ªºµù¸Ñ³£·|³Q±Ë±ó¡A¦ý¯S®íºX¼Ðµù¸Ñ©MÀɮצì¸m³£·|³Q«O¯d¡C¤ñ¸û®É¦pªG¦³¤£§¹¥þ\n" "°t¦Xªº¦r¦ê¥X²{¡Aµ{¦¡·|¥H¼Ò½k°t¹ïªº¤è¦¡±o¥X¸û¦nªºµ²ªG¡C\n" -#: src/msgmerge.c:408 +#: src/msgmerge.c:413 #, no-wrap msgid "" "Input file location:\n" @@ -1729,7 +1743,7 @@ msgstr "" " -D, --directory=¥Ø¿ý ¦P®É¦b<¥Ø¿ý>¤¤·j´M¿é¤JÀÉ\n" " -C, --compendium=ÀÉ®× ÃB¥~ªºÂ½Ä¶°T®§®w¡A¥i¨Ï¥Î¦h©ó¤@¦¸\n" -#: src/msgmerge.c:418 +#: src/msgmerge.c:423 #, no-wrap msgid "" "Operation mode:\n" @@ -1740,7 +1754,7 @@ msgstr "" " -U, --update §ó·s def.po¡A©Î¬O·í def.po ¤w¬O³Ì·sª©¥»®É¡A\n" " ¤£¶i¦æ¥ô¦ó¾Þ§@¡C\n" -#: src/msgmerge.c:433 +#: src/msgmerge.c:438 #, no-wrap msgid "" "Output file location in update mode:\n" @@ -1769,7 +1783,7 @@ msgstr "" "³Æ¥÷Àɪº«á¸m¦r¤¸¬°¡¥~¡¦¡A°£«D¥H --suffix ¿ï¶µ©Î¬O SIMPLE_BACKUP_SUFFIX\n" "Àô¹ÒÅܼƫü©w¡C\n" -#: src/msgmerge.c:470 +#: src/msgmerge.c:477 #, no-wrap msgid "" "Informative output:\n" @@ -1784,15 +1798,15 @@ msgstr "" " -v, --verbose ¼W¥[¿é¥Xªº¸Ô²Óµ{«×\n" " -q, --quiet, --silent ¤£Åã¥Ü¶i«×«ü¥Ü\n" -#: src/msgmerge.c:930 +#: src/msgmerge.c:937 msgid "this message should define plural forms" msgstr "¦¹°T®§À³¸Ó¦³½Æ¼Æ«¬ºA" -#: src/msgmerge.c:953 +#: src/msgmerge.c:960 msgid "this message should not define plural forms" msgstr "¦¹°T®§¤£À³¦³½Æ¼Æ«¬ºA" -#: src/msgmerge.c:1084 +#: src/msgmerge.c:1091 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -1802,26 +1816,26 @@ msgstr "" "Ū¤J %ld ½Ķ + %ld °Ñ¦Ò±ø¥Ø¡C¦X¨Ö¡G%ld¡A¼Ò½k¡G%ld¡A¥¼Ä¶¡G%ld¡A¹L®É¡G%" "ld¡C\n" -#: src/msgmerge.c:1092 +#: src/msgmerge.c:1099 msgid " done.\n" msgstr " §¹¦¨¡C\n" -#: src/msgunfmt.c:221 src/msgunfmt.c:230 +#: src/msgunfmt.c:226 src/msgunfmt.c:235 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "¨Ï¥Î %s ¤£¯à¦P®É«ü©wÀɮצWºÙ" -#: src/msgunfmt.c:314 +#: src/msgunfmt.c:319 #, c-format, no-wrap msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "¥Îªk¡G%s [¿ï¶µ] [ÀÉ®×]...\n" -#: src/msgunfmt.c:319 +#: src/msgunfmt.c:324 #, no-wrap msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "±N¤G¤¸½X½ĶÀÉÂà´«¬° Uniforum «¬¦¡ªº .po ÀÉ¡C\n" -#: src/msgunfmt.c:329 +#: src/msgunfmt.c:334 #, no-wrap msgid "" "Operation mode:\n" @@ -1832,7 +1846,7 @@ msgstr "" " -j, --java Java ¼Ò¦¡¡G¿é¤J¸ê®Æ¬O Java ResourceBundle class\n" " --tcl Tcl ¼Ò¦¡¡G¿é¤J¸ê®Æ¬O tcl/msgcat .msg ÀÉ®×\n" -#: src/msgunfmt.c:336 +#: src/msgunfmt.c:341 #, no-wrap msgid "" "Input file location:\n" @@ -1843,7 +1857,7 @@ msgstr "" " ¿é¤JÀÉ ... ¿é¤Jªº .mo ÀÉ\n" "¦pªG¨S¦³«ü©w¿é¤JÀɩοé¤JÀɬO¡¥-¡¦¡A«hŪ¨ú¼Ð·Ç¿é¤J¡C\n" -#: src/msgunfmt.c:343 +#: src/msgunfmt.c:348 #, no-wrap msgid "" "Input file location in Java mode:\n" @@ -1858,7 +1872,7 @@ msgstr "" "class ¦WºÙ¬O¥Ñ»y¨t¦WºÙ©M resource ¦WºÙ¦X¨Ö¨Ó¨M©wªº¡A¨âªÌ¤§¶¡·|¥Î©³½u¤À¹j¡C\n" "class ÀÉ·|¦b CLASSPATH ªí¥Üªº¥Ø¿ý¤¤·j´M¡C\n" -#: src/msgunfmt.c:352 +#: src/msgunfmt.c:357 #, no-wrap msgid "" "Input file location in Tcl mode:\n" @@ -1872,7 +1886,7 @@ msgstr "" " -d ¥Ø¿ý .msg ½ĶÀɦs©ñªº¥Ø¿ý\n" "-l ©M -d ¿ï¶µ¬O¥²­nªº¡C©Ò²£¥Íªº .msg ÀÉ·|¦s©ñ¦b«ü©wªº¥Ø¿ý¡C\n" -#: src/msgunfmt.c:361 +#: src/msgunfmt.c:366 #, no-wrap msgid "" "Output file location:\n" @@ -1884,8 +1898,8 @@ msgstr "" " -o, --output-file=ÀÉ®× ±N¿é¥X¼g¤J¦Ü«ü©wªºÀÉ®×\n" "¦pªG¨S¦³«ü©w¿é¥XÀɩοé¥XÀɬO¡¥-¡¦¡A«h·|±Nµ²ªG¼g¤J¦Ü¼Ð·Ç¿é¥X¡C\n" -#: src/msgunfmt.c:369 -#, no-wrap +#: src/msgunfmt.c:374 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -1894,6 +1908,8 @@ msgid "" " -i, --indent write indented output style\n" " --strict write strict uniforum style\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" msgstr "" "¿é¥X²Ó¸`¡G\n" @@ -1905,7 +1921,7 @@ msgstr "" " -w, --width=¼Æ¦r ³]©w¿é¥Xªº¼e«×\n" " -s, --sort-output ¿é¥X®É¥ý±N¶µ¥Ø±Æ§Ç\n" -#: src/msgunfmt.c:381 +#: src/msgunfmt.c:388 #, no-wrap msgid "" "Informative output:\n" @@ -1918,7 +1934,7 @@ msgstr "" " -V, --version Åã¥Üª©¥»¸ê°T¨ÃÂ÷¶}\n" " -v, --verbose ¼W¥[¿é¥Xªº¸Ô²Óµ{«×\n" -#: src/msguniq.c:279 +#: src/msguniq.c:284 #, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -1938,7 +1954,7 @@ msgstr "" "«h·|¥Ñ²Ä¤@­Ó½Ķ±ø¥Ø¤¤Àò¨ú³o¨Ç¸ê®Æ¡CÀɮצì¸m¬O·|²Ö¿n¤U¨Óªº¡C·í¨Ï¥Î --unique\n" "¿ï¶µ®É¡A«h·|±Ë±ó¥ô¦ó­«ÂЪºÂ½Ä¶±ø¥Ø¡C\n" -#: src/msguniq.c:312 +#: src/msguniq.c:317 #, no-wrap msgid "" "Message selection:\n" @@ -2089,7 +2105,7 @@ msgstr " msgid "too many errors, aborting" msgstr "¿ù»~¤Ó¦h¡A¥²¶·¤¤Â_§@·~" -#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441 +#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453 msgid "invalid multibyte sequence" msgstr "µL®Äªº¦h¦r¤¸§Ç¦C" @@ -2190,7 +2206,7 @@ msgstr " msgid "failed to create \"%s\"" msgstr "µLªk«Ø¥ß¡§%s¡¨" -#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000 +#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012 #, c-format msgid "error while writing \"%s\" file" msgstr "·í¼g¤JÀɮס§%s¡¨®Éµo¥Í¿ù»~" @@ -2205,13 +2221,13 @@ msgstr "" msgid "error while opening \"%s\" for writing" msgstr "·í¶}±ÒÀɮס§%s¡¨·Ç³Æ¼g¤J®Éµo¥Í¿ù»~" -#: src/write-po.c:390 +#: src/write-po.c:402 #, c-format msgid "" "internationalized messages should not contain the `\\%c' escape sequence" msgstr "°ê»Ú¤Æªº°T®§¤£À³§t¦³¡¥\\%c¡¦³o­Ó·¸¥X§Ç¦C¦r¤¸" -#: src/write-po.c:758 src/write-po.c:852 +#: src/write-po.c:770 src/write-po.c:864 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -2224,12 +2240,12 @@ msgstr "" "½Ð¦Ò¼{¨Ï¥Î¥u¦³ ASCII ¦r¤¸ªº msgid¡C\n" "%s\n" -#: src/write-po.c:919 +#: src/write-po.c:931 #, c-format msgid "cannot create output file \"%s\"" msgstr "µLªk«Ø¥ß¿é¥XÀÉ¡§%s¡¨" -#: src/write-po.c:926 +#: src/write-po.c:938 #, no-c-format msgid "standard output" msgstr "¼Ð·Ç¿é¥X" @@ -2244,7 +2260,7 @@ msgstr "%s msgid "%s:%d: warning: unterminated string literal" msgstr "%s¡G%d¡Gĵ§i¡G¥¼§¹µ²ªº¦r¦ê" -#: src/x-po.c:106 src/xgettext.c:634 +#: src/x-po.c:106 src/xgettext.c:640 msgid "this file may not contain domain directives" msgstr "¦¹Àɮפ£¯à§t¦³»â°ì«ü¥O" @@ -2263,32 +2279,32 @@ msgstr "%s msgid "%s:%d: invalid string expression" msgstr "%s¡G%d¡GµL®Äªº¦r¦êªí¥Ü¦¡" -#: src/xgettext.c:397 +#: src/xgettext.c:401 msgid "--join-existing cannot be used when output is written to stdout" msgstr "·íµ²ªG³Q¾É¦V¦Ü¼Ð·Ç¿é¥X®É¡A¿ï¶µ --join-existing ¤£¯à¨Ï¥Î" -#: src/xgettext.c:402 +#: src/xgettext.c:406 msgid "xgettext cannot work without keywords to look for" msgstr "­YµLÃöÁä¦r¡Axgettext ±NµLªk¹B§@" -#: src/xgettext.c:490 +#: src/xgettext.c:494 #, c-format msgid "warning: file `%s' extension `%s' is unknown; will try C" msgstr "ĵ§i¡GÀɮס¥%s¡¦ªº°ÆÀɦW¡¥%s¡¦¥¼©ú¡F·|°²³]¬O C ®æ¦¡¨Ó³B²z" -#: src/xgettext.c:535 +#: src/xgettext.c:539 #, no-wrap msgid "Extract translatable strings from given input files.\n" msgstr "¥Ñ«ü©wªº¿é¤JÀÉ©â¨ú¥i½Ķªº¦r¦ê¡C\n" -#: src/xgettext.c:540 +#: src/xgettext.c:544 #, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" "Similarly for optional arguments.\n" msgstr "ªø¿ï¶µ¥²­nªº°Ñ¼Æ¦b¨Ï¥Îµu¿ï¶µ®É¤]¬O¥²­nªº¡C¹ï©ó¿ï¾Ü©Êªº°Ñ¼Æ¤]¤@¼Ë¡C\n" -#: src/xgettext.c:555 +#: src/xgettext.c:559 #, no-wrap msgid "" "Output file location:\n" @@ -2302,7 +2318,7 @@ msgstr "" " -o, --output=ÀÉ®× ±Nµ²ªG¼g¤J¦Ü«ü©wªºÀÉ®×\n" " -p, --output-dir=¥Ø¿ý ¿é¥XÀÉ·|©ñ¦b«ü©wªº<¥Ø¿ý>\n" -#: src/xgettext.c:564 +#: src/xgettext.c:568 #, no-wrap msgid "" "Choice of input file language:\n" @@ -2321,7 +2337,7 @@ msgstr "" " -C, --c++ --language=C++ ªºÁY¼g\n" "¹w³]ªº»y¨¥¬O¥Ñ¿é¤JÀɪº©µ¦ùÀɦW¨M©wªº¡C\n" -#: src/xgettext.c:575 +#: src/xgettext.c:579 #, no-wrap msgid "" "Operation mode:\n" @@ -2331,7 +2347,7 @@ msgid "" " preceding keyword lines) in output file\n" msgstr "" -#: src/xgettext.c:584 +#: src/xgettext.c:588 #, no-wrap msgid "" "Language=C/C++ specific options:\n" @@ -2348,8 +2364,8 @@ msgstr "" " -T, --trigraphs ¯d·N¿é¤J¸ê®Æ¤¤ªº ANSI C trigraph\n" " --debug ¶i¦æ®æ¦¡¦r¦êÃѧO®ÉÅã¥Ü§ó¸Ô²Óªºµ²ªG\n" -#: src/xgettext.c:594 -#, no-wrap +#: src/xgettext.c:598 +#, fuzzy, no-wrap msgid "" "Output details:\n" " -e, --no-escape do not use C escapes in output (default)\n" @@ -2360,6 +2376,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n" @@ -2387,11 +2405,11 @@ msgstr "" " -M, --msgstr-suffix[=¦r¦ê] msgstr ±ø¥Ø¨Ï¥Î<¦r¦ê>§@¬°«á¸m¦r¦ê\n" " (¹w³]¬°ªÅ¥Õ¦r¦ê \"\")\n" -#: src/xgettext.c:814 +#: src/xgettext.c:820 msgid "standard input" msgstr "¼Ð·Ç¿é¤J" -#: src/xgettext.c:929 +#: src/xgettext.c:935 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -2401,7 +2419,7 @@ msgstr "" "gettext(\"\") ·|¦^¶ÇÀɮ׶}©l³¡¥÷ªº¸ê°T¡A\n" "¨Ã«DªÅ¥Õ¦r¦ê¡C\n" -#: src/xgettext.c:1285 +#: src/xgettext.c:1291 #, c-format msgid "language `%s' unknown" msgstr "¤£©úªº»y¨¥¡¥%s¡¦" diff --git a/tests/rpathlx/aclocal.m4 b/tests/rpathlx/aclocal.m4 index 966d6f221..0494463ac 100644 --- a/tests/rpathlx/aclocal.m4 +++ b/tests/rpathlx/aclocal.m4 @@ -491,7 +491,7 @@ else $1_FALSE= fi]) -# lib-link.m4 serial 1 (gettext-0.11) +# lib-link.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -927,6 +927,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` diff --git a/tests/rpathlx/configure b/tests/rpathlx/configure index eec65ff64..f8d1a4bc6 100755 --- a/tests/rpathlx/configure +++ b/tests/rpathlx/configure @@ -1645,6 +1645,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; diff --git a/tests/rpathly/aclocal.m4 b/tests/rpathly/aclocal.m4 index 966d6f221..0494463ac 100644 --- a/tests/rpathly/aclocal.m4 +++ b/tests/rpathly/aclocal.m4 @@ -491,7 +491,7 @@ else $1_FALSE= fi]) -# lib-link.m4 serial 1 (gettext-0.11) +# lib-link.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -927,6 +927,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` diff --git a/tests/rpathly/configure b/tests/rpathly/configure index 8e26092c1..202f26ded 100755 --- a/tests/rpathly/configure +++ b/tests/rpathly/configure @@ -1645,6 +1645,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; diff --git a/tests/rpathlyx/aclocal.m4 b/tests/rpathlyx/aclocal.m4 index 966d6f221..0494463ac 100644 --- a/tests/rpathlyx/aclocal.m4 +++ b/tests/rpathlyx/aclocal.m4 @@ -491,7 +491,7 @@ else $1_FALSE= fi]) -# lib-link.m4 serial 1 (gettext-0.11) +# lib-link.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -927,6 +927,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` diff --git a/tests/rpathlyx/configure b/tests/rpathlyx/configure index a1bcb9286..647b92cf0 100755 --- a/tests/rpathlyx/configure +++ b/tests/rpathlyx/configure @@ -1648,6 +1648,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; @@ -1741,7 +1764,7 @@ echo "$ac_t""$ac_cv_librpathx_libs" 1>&6 echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6 -echo "configure:1745: checking how to link with librpathy" >&5 +echo "configure:1768: checking how to link with librpathy" >&5 if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2051,6 +2074,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; diff --git a/tests/rpathy/aclocal.m4 b/tests/rpathy/aclocal.m4 index 59cf3b111..65a070fcf 100644 --- a/tests/rpathy/aclocal.m4 +++ b/tests/rpathy/aclocal.m4 @@ -497,6 +497,7 @@ fi]) builtin([undefine],[symbols]) # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -622,9 +623,30 @@ _LT_AC_LTCONFIG_HACK ]) +# AC_LIBTOOL_HEADER_ASSERT +# ------------------------ +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], +[AC_CACHE_CHECK([whether $CC supports assert without backlinking], + [lt_cv_func_assert_works], + [case $host in + *-*-solaris*) + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) lt_cv_func_assert_works=no ;; + *) lt_cv_func_assert_works=yes ;; + esac + fi + ;; + esac]) + +if test "x$lt_cv_func_assert_works" = xyes; then + AC_CHECK_HEADERS(assert.h) +fi +])# AC_LIBTOOL_HEADER_ASSERT + # _LT_AC_CHECK_DLFCN # -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, +AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN @@ -642,10 +664,10 @@ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. -[symcode='[BCDEGRST]'] +symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)'] +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' # Transform the above into a raw symbol and a C symbol. symxfrm='\1 \2\3 \3' @@ -653,25 +675,29 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Define system-specific variables. case $host_os in aix*) - [symcode='[BCDT]'] + symcode='[[BCDT]]' ;; cygwin* | mingw* | pw32*) - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) - [symcode='[BCDEGRST]'] + symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) - [symcode='[BDT]'] + symcode='[[BDT]]' ;; sysv4) - [symcode='[DFNSTU]'] + symcode='[[DFNSTU]]' ;; esac @@ -685,14 +711,14 @@ esac # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - [symcode='[ABCDGISTW]'] + symcode='[[ABCDGISTW]]' fi # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do # Write the raw and C identifiers. -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"] +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -734,23 +760,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } -[lt_preloaded_symbols[] =] +lt_preloaded_symbols[[]] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -794,10 +820,13 @@ done global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then AC_MSG_RESULT(failed) else AC_MSG_RESULT(ok) @@ -815,16 +844,17 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will find an echo command which doesn;t interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) + [AC_DIVERT_PUSH(NOTICE)]) _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR # Check that we are running under the correct shell. @@ -890,7 +920,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -979,7 +1009,7 @@ AC_DIVERT_POP # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else @@ -1066,7 +1096,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -1088,16 +1118,22 @@ else ;; *) - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen", - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load", - [AC_CHECK_LIB(svld, dlopen, - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB(dld, shl_load, - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) ]) - ]) - ]) + ]) + ]) ]) ;; esac @@ -1160,10 +1196,10 @@ AC_DEFUN([_LT_AC_LTCONFIG_HACK], # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g' # Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g' # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. @@ -1232,8 +1268,15 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. @@ -1253,7 +1296,7 @@ rmdir .libs 2>/dev/null AC_MSG_RESULT($objdir) -AC_ARG_WITH(pic, +AC_ARG_WITH(pic, [ --with-pic try to use only PIC/non-PIC objects [default=use both]], pic_mode="$withval", pic_mode=default) test -z "$pic_mode" && pic_mode=default @@ -1281,7 +1324,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -1316,13 +1359,13 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -1391,9 +1434,9 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -1460,7 +1503,7 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries]) - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then : + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then : else AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure]) lt_cv_prog_cc_can_build_shared=no @@ -1536,6 +1579,8 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo AC_TRY_COMPILE([], [int some_variable = 0;], [dnl # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -1545,10 +1590,11 @@ if test x"$compiler_c_o" = x"yes"; then lt_cv_compiler_o_lo=yes fi ]) + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" ]) compiler_o_lo=$lt_cv_compiler_o_lo - AC_MSG_RESULT([$compiler_c_lo]) + AC_MSG_RESULT([$compiler_o_lo]) else compiler_o_lo=no fi @@ -1641,7 +1687,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -1649,7 +1695,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -1736,7 +1784,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -1749,24 +1797,24 @@ EOF # Be careful not to strip the DATA tag left be newer dlltools. export_symbols_cmds="$ltdll_cmds"' $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~ - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols' + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \[$]# in - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \[$]# in + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -1861,80 +1909,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[[012]]|aix4.[[012]].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok" - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -1966,11 +2030,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[[012]]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -2045,7 +2116,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -2053,10 +2124,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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 $linker_flags' + 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 $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -2101,10 +2186,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [[12]].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -2113,7 +2227,7 @@ else hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no case $host_os in - [solaris2.[0-5] | solaris2.[0-5].*]) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; esac @@ -2136,7 +2250,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -2293,22 +2407,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - [ aix4 | aix4.[01] | aix4.[01].*)] - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -2317,14 +2433,13 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -2355,7 +2470,7 @@ cygwin* | mingw* | pw32*) case $GCC,$host_os in yes,cygwin*) library_names_spec='$libname.dll.a' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ @@ -2365,14 +2480,14 @@ cygwin* | mingw* | pw32*) $rm \$dlpath' ;; yes,mingw*) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ;; *) - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' @@ -2530,9 +2645,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -2643,6 +2768,33 @@ test "$dynamic_linker" = no && can_build_shared=no AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no @@ -2738,6 +2890,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -2804,12 +2957,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -2975,6 +3128,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -3097,9 +3253,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -3454,6 +3610,7 @@ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -3467,8 +3624,8 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] + [[\\/]]* | [[A-Za-z]]:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do @@ -3492,7 +3649,7 @@ else fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -3556,7 +3713,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -3571,7 +3728,7 @@ beos*) ;; bsdi4*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3585,7 +3742,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.[012]) + rhapsody* | darwin1.[[012]]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -3600,7 +3757,7 @@ freebsd*) i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -3615,7 +3772,7 @@ gnu*) ;; hpux10.20*|hpux11*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; @@ -3634,7 +3791,7 @@ irix5* | irix6*) *) libmagic=never-match;; esac # this will be overridden with pass_all, but let us keep it just in case - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" ;; esac lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` @@ -3644,29 +3801,39 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; esac lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$' else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$' fi ;; newos6*) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -3683,14 +3850,14 @@ solaris*) lt_cv_file_magic_test_file=/lib/libc.so ;; -[sysv5uw[78]* | sysv4*uw2*)] +sysv5uw[[78]]* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) case $host_vendor in motorola) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; ncr) @@ -3698,11 +3865,11 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ;; sequent) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; sni) lt_cv_file_magic_cmd='/bin/file' - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"] + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; esac @@ -3716,13 +3883,14 @@ deplibs_check_method=$lt_cv_deplibs_check_method # AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl +AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm @@ -3833,7 +4001,7 @@ AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) -# lib-link.m4 serial 1 (gettext-0.11) +# lib-link.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -4269,6 +4437,33 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) dnl Handle this in the next round. names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` diff --git a/tests/rpathy/configure b/tests/rpathy/configure index 97fccb6de..cab8084d3 100755 --- a/tests/rpathy/configure +++ b/tests/rpathy/configure @@ -31,6 +31,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then *-DOS) lt_cv_sys_path_separator=';' ;; *) lt_cv_sys_path_separator=':' ;; esac + PATH_SEPARATOR=$lt_cv_sys_path_separator fi @@ -97,7 +98,7 @@ else # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR for dir in $PATH /usr/ucb; do if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && @@ -734,7 +735,7 @@ am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:738: checking for a BSD compatible install" >&5 +echo "configure:739: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -787,7 +788,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:791: checking whether build environment is sane" >&5 +echo "configure:792: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftest.file @@ -858,7 +859,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:862: checking for $ac_word" >&5 +echo "configure:863: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -888,7 +889,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:892: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:893: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1007,7 +1008,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1011: checking for $ac_word" >&5 +echo "configure:1012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1037,7 +1038,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1041: checking for $ac_word" >&5 +echo "configure:1042: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1088,7 +1089,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1092: checking for $ac_word" >&5 +echo "configure:1093: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1120,7 +1121,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1124: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1131,12 +1132,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1135 "configure" +#line 1136 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1162,12 +1163,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1166: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1171: checking whether we are using GNU C" >&5 +echo "configure:1172: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1176,7 +1177,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1195,7 +1196,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1199: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1200: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1234,7 +1235,7 @@ doit: END # If we don't find an include directive, just comment out the code. echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6 -echo "configure:1238: checking for style of include used by $am_make" >&5 +echo "configure:1239: checking for style of include used by $am_make" >&5 am__include='#' am__quote= _am_result=none @@ -1268,7 +1269,7 @@ rm -f confinc confmf depcc="$CC" am_compiler_list= echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6 -echo "configure:1272: checking dependency style of $depcc" >&5 +echo "configure:1273: checking dependency style of $depcc" >&5 if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1334,13 +1335,24 @@ echo "$ac_t""$am_cv_CC_dependencies_compiler_type" 1>&6 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type" +# Find the correct PATH separator. Usually this is `:', but +# DJGPP uses `;' like DOS. +if test "X${PATH_SEPARATOR+set}" != Xset; then + UNAME=${UNAME-`uname 2>/dev/null`} + case X$UNAME in + *-DOS) lt_cv_sys_path_separator=';' ;; + *) lt_cv_sys_path_separator=':' ;; + esac + PATH_SEPARATOR=$lt_cv_sys_path_separator +fi + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1339: checking for Cygwin environment" >&5 +echo "configure:1351: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1368,19 +1380,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1372: checking for mingw32 environment" >&5 +echo "configure:1384: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1397,7 +1409,7 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1401: checking how to run the C preprocessor" >&5 +echo "configure:1413: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1412,13 +1424,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1429,13 +1441,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1446,13 +1458,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1552,7 +1564,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1556: checking host system type" >&5 +echo "configure:1568: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1573,7 +1585,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1577: checking build system type" >&5 +echo "configure:1589: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1602,7 +1614,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1606: checking for ld used by GCC" >&5 +echo "configure:1618: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1632,16 +1644,16 @@ echo "configure:1606: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1636: checking for GNU ld" >&5 +echo "configure:1648: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1639: checking for non-GNU ld" >&5 +echo "configure:1651: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -1670,7 +1682,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1674: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1686: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1687,7 +1699,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1691: checking for $LD option to reload object files" >&5 +echo "configure:1703: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1699,7 +1711,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1703: checking for BSD-compatible nm" >&5 +echo "configure:1715: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1707,7 +1719,7 @@ else # Let the user override the test. lt_cv_path_NM="$NM" else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do test -z "$ac_dir" && ac_dir=. tmp_nm=$ac_dir/${ac_tool_prefix}nm @@ -1737,7 +1749,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1741: checking whether ln -s works" >&5 +echo "configure:1753: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1758,7 +1770,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1762: checking how to recognise dependant libraries" >&5 +echo "configure:1774: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1771,7 +1783,7 @@ lt_cv_deplibs_check_method='unknown' # `unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. -# ['file_magic [regex]'] -- check by looking for files in library path +# 'file_magic [[regex]]' -- check by looking for files in library path # which responds to the $file_magic_cmd with a given egrep regex. # If you have `file' or equivalent on your system and you're not sure # whether `pass_all' will *always* work, you probably want this one. @@ -1800,7 +1812,7 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in - rhapsody* | darwin1.012) + rhapsody* | darwin1.[012]) lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` ;; *) # Darwin 1.3 on @@ -1859,7 +1871,7 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) case $host_cpu in - alpha* | i*86 | powerpc* | sparc* | ia64* ) + alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -1882,6 +1894,16 @@ newos6*) lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; +openbsd*) + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + else + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' + fi + ;; + osf3* | osf4* | osf5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' @@ -1931,13 +1953,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1935: checking for object suffix" >&5 +echo "configure:1957: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1957,7 +1979,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1961: checking for executable suffix" >&5 +echo "configure:1983: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1967,7 +1989,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1998,7 +2020,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:2002: checking command to parse $NM output" >&5 +echo "configure:2024: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2018,6 +2040,9 @@ symxfrm='\1 \2\3 \3' # Transform an extracted symbol line into a proper C declaration lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + # Define system-specific variables. case $host_os in aix*) @@ -2028,6 +2053,7 @@ cygwin* | mingw* | pw32*) ;; hpux*) # Its linker distinguishes data from code symbols lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; irix*) symcode='[BCDEGRST]' @@ -2074,10 +2100,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:2078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:2081: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:2107: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -2099,23 +2125,23 @@ EOF cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * +# define lt_ptr void * #else -# define lt_ptr_t char * +# define lt_ptr char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr_t address; + lt_ptr address; } lt_preloaded_symbols[] = { EOF - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} + {0, (lt_ptr) 0} }; #ifdef __cplusplus @@ -2128,7 +2154,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -2161,10 +2187,13 @@ fi global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" if test -z "$lt_cv_sys_global_symbol_pipe"; then global_symbol_to_cdecl= + global_symbol_to_c_name_address= else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" fi -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; +then echo "$ac_t""failed" 1>&6 else echo "$ac_t""ok" 1>&6 @@ -2174,17 +2203,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2178: checking for $ac_hdr" >&5 +echo "configure:2207: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2219,7 +2248,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2223: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2252: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2281,7 +2310,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2285: checking for file" >&5 +echo "configure:2314: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2352,7 +2381,7 @@ esac # 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2356: checking for $ac_word" >&5 +echo "configure:2385: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2384,7 +2413,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2388: checking for $ac_word" >&5 +echo "configure:2417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2419,7 +2448,7 @@ fi # 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2423: checking for $ac_word" >&5 +echo "configure:2452: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2451,7 +2480,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2455: checking for $ac_word" >&5 +echo "configure:2484: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2500,8 +2529,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2504 "configure"' > conftest.$ac_ext - if { (eval echo configure:2505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2533 "configure"' > conftest.$ac_ext + if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2522,7 +2551,7 @@ case $host in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2526: checking whether the C compiler needs -belf" >&5 +echo "configure:2555: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2535,14 +2564,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2646,8 +2675,15 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi # Allow CC to be a program name with arguments. @@ -2655,7 +2691,7 @@ set dummy $CC compiler="$2" echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:2659: checking for objdir" >&5 +echo "configure:2695: checking for objdir" >&5 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -2682,7 +2718,7 @@ test -z "$pic_mode" && pic_mode=default # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:2686: checking for $compiler option to produce PIC" >&5 +echo "configure:2722: checking for $compiler option to produce PIC" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2704,7 +2740,7 @@ else # libC (AIX C++ library), which obviously doesn't included in libraries # list by gcc. This cause undefined symbols with -static flags. # This hack allows C programs to be linked with "-static -ldl", but - # we not sure about C++ programs. + # not sure about C++ programs. lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC" ;; amigaos*) @@ -2739,13 +2775,13 @@ else # PORTME Check for PIC flags for the system compiler. case $host_os in aix3* | aix4* | aix5*) + lt_cv_prog_cc_wl='-Wl,' # All AIX code is PIC. if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_cv_prog_cc_static='-Bstatic' - lt_cv_prog_cc_wl='-Wl,' + # AIX 5 now supports IA64 processor + lt_cv_prog_cc_static='-Bstatic' else - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -2814,9 +2850,9 @@ else lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' if test "x$host_vendor" = xsni; then - lt_cv_prog_cc_wl='-LD' + lt_cv_prog_cc_wl='-LD' else - lt_cv_prog_cc_wl='-Wl,' + lt_cv_prog_cc_wl='-Wl,' fi ;; @@ -2847,21 +2883,21 @@ else # Check to make sure the pic_flag actually works. echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:2851: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +echo "configure:2887: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in hpux9* | hpux10* | hpux11*) @@ -2913,7 +2949,7 @@ if test -n "$lt_cv_prog_cc_shlib"; then fi echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:2917: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "configure:2953: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2921,14 +2957,14 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_prog_cc_static_works=yes else @@ -2955,7 +2991,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:2959: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:2995: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2974,7 +3010,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:2978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -3003,7 +3039,7 @@ echo "$ac_t""$compiler_c_o" 1>&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:3007: checking if $compiler supports -c -o file.lo" >&5 +echo "configure:3043: checking if $compiler supports -c -o file.lo" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3011,15 +3047,17 @@ else lt_cv_compiler_o_lo=no save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" + save_objext="$ac_objext" + ac_objext=lo cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3034,12 +3072,13 @@ else cat conftest.$ac_ext >&5 fi rm -f conftest* + ac_objext="$save_objext" CFLAGS="$save_CFLAGS" fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$ac_t""$compiler_c_lo" 1>&6 + echo "$ac_t""$compiler_o_lo" 1>&6 else compiler_o_lo=no fi @@ -3049,7 +3088,7 @@ hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:3053: checking if we can lock with hard links" >&5 +echo "configure:3092: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -3068,20 +3107,20 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:3072: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:3111: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -3108,7 +3147,7 @@ fi # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:3112: checking whether the linker ($LD) supports shared libraries" >&5 +echo "configure:3151: checking whether the linker ($LD) supports shared libraries" >&5 allow_undefined_flag= no_undefined_flag= @@ -3149,7 +3188,7 @@ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" extract_expsyms_cmds= case $host_os in -cygwin* | mingw* | pw32* ) +cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -3157,7 +3196,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; - +openbsd*) + with_gnu_ld=no + ;; esac ld_shlibs=yes @@ -3244,7 +3285,7 @@ EOF # can override, but on older systems we have to supply one (in ltdll.c) if test "x$lt_cv_need_dllmain" = "xyes"; then ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext " - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~ + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~ test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~' else ltdll_obj= @@ -3263,18 +3304,18 @@ EOF # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; + cp $export_symbols $output_objdir/$soname-def; else - echo EXPORTS > $output_objdir/$soname-def; - _lt_hint=1; - cat $export_symbols | while read symbol; do - set dummy \$symbol; - case \$# in - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; - esac; - _lt_hint=`expr 1 + \$_lt_hint`; - done; + echo EXPORTS > $output_objdir/$soname-def; + _lt_hint=1; + cat $export_symbols | while read symbol; do + set dummy \$symbol; + case \$# in + 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; + esac; + _lt_hint=`expr 1 + \$_lt_hint`; + done; fi~ '"$ltdll_cmds"' $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~ @@ -3369,80 +3410,96 @@ else ;; aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can # have problems creating the table of contents. If linking a library # or program results in "error TOC overflow" add -mminimal-toc to # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + hardcode_direct=yes archive_cmds='' hardcode_libdir_separator=':' if test "$GCC" = yes; then - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi + case $host_os in aix4.[012]|aix4.[012].*) + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + esac + shared_flag='-shared' else + # not using gcc if test "$host_cpu" = ia64; then - shared_flag='-G' + shared_flag='${wl}-G' else - shared_flag='${wl}-bM:SRE' + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi fi - hardcode_direct=yes fi - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # Test if we are trying to use run time linking, or normal AIX style linking. - # If -brtl is somewhere in LDFLAGS, we need to do run time linking. - aix_use_runtimelinking=no - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then - aix_use_runtimelinking=yes - break - fi - done - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi # It seems that -bexpall can do strange things, so it is better to # generate a list of symbols to export. always_export_symbols=yes if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' - allow_undefined_flag=' -Wl,-G' - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-znodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" else - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' - # Warning - without using the other run time loading flags, -berok will - # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok" - # This is a bit strange, but is similar to how AIX traditionally builds - # it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='${wl}-berok' + # This is a bit strange, but is similar to how AIX traditionally builds + # it's shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; @@ -3474,11 +3531,18 @@ else ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + case "$host_os" in + rhapsody* | darwin1.[012]) + allow_undefined_flag='-undefined suppress' + ;; + *) # Darwin 1.3 on + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes @@ -3553,7 +3617,7 @@ else ;; newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: @@ -3561,10 +3625,24 @@ else ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' 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 $linker_flags' + 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 $linker_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi ;; os2*) @@ -3609,10 +3687,39 @@ else hardcode_shlibpath_var=no runpath_var=LD_RUN_PATH hardcode_runpath_var=yes + export_dynamic_flag_spec='${wl}-Bexport' ;; solaris*) + # gcc --version < 3.0 without binutils cannot create self contained + # shared libraries reliably, requiring libgcc.a to resolve some of + # the object symbols generated in some cases. Libraries that use + # assert need libgcc.a to resolve __eprintf, for example. Linking + # a copy of libgcc.a into every shared library to guarantee resolving + # such symbols causes other problems: According to Tim Van Holder + # , C++ libraries end up with a separate + # (to the application) exception stack for one thing. no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + case `$CC --version 2>/dev/null` in + [12].*) + cat <&2 + +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably +*** create self contained shared libraries on Solaris systems, without +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling +*** -no-undefined support, which will at least allow you to build shared +*** libraries. However, you may find that when you link such libraries +*** into an application without using GCC, you have to manually add +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to +*** upgrade to a newer version of GCC. Another option is to rebuild your +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer. + +EOF + no_undefined_flag= + ;; + esac + fi # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -3644,7 +3751,7 @@ else sysv4) if test "x$host_vendor" = xsno; then - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes # is this really true??? else archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -3724,7 +3831,7 @@ test "$ld_shlibs" = no && can_build_shared=no # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:3728: checking how to hardcode library paths into programs" >&5 +echo "configure:3835: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -3752,7 +3859,7 @@ echo "$ac_t""$hardcode_action" 1>&6 striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:3756: checking whether stripping libraries is possible" >&5 +echo "configure:3863: checking whether stripping libraries is possible" >&5 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" @@ -3766,7 +3873,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown # PORTME Fill in your ld.so characteristics echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:3770: checking dynamic linker characteristics" >&5 +echo "configure:3877: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -3804,22 +3911,24 @@ aix4* | aix5*) # depend on `.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. + # AIX (on Power*) has no versioning support, so currently we can + # not hardcode correct soname into executable. Probably we can + # add versioning support to collect2, so additional links can + # be useful in future. if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so instead of - # lib.a to let people know that these are not typical AIX shared libraries. + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' else # We preserve .a as extension for shared libraries through AIX4.2 @@ -3828,7 +3937,6 @@ aix4* | aix5*) soname_spec='${libname}${release}.so$major' fi shlibpath_var=LIBPATH - deplibs_check_method=pass_all fi ;; @@ -4041,9 +4149,19 @@ newsos6) openbsd*) version_type=sunos - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - need_version=no + need_lib_prefix=no + need_version=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case "$host_os" in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' @@ -4152,9 +4270,38 @@ test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:4156: checking if libtool supports shared libraries" >&5 +echo "configure:4274: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 +echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 +echo "configure:4278: checking whether to build shared libraries" >&5 +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case "$host_os" in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +echo "$ac_t""$enable_shared" 1>&6 + +echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 +echo "configure:4301: checking whether to build static libraries" >&5 +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +echo "$ac_t""$enable_static" 1>&6 + if test "$hardcode_action" = relink; then # Fast installation is not supported enable_fast_install=no @@ -4190,27 +4337,73 @@ else ;; *) - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4195: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +echo "configure:4342: checking for shl_load" >&5 +if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* 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() { + +/* 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) +choke me +#else +shl_load(); +#endif + +; return 0; } +EOF +if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_shl_load=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="shl_load" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +echo "configure:4388: checking for shl_load in -ldld" >&5 +ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" +LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4225,16 +4418,16 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4233: checking for dlopen" >&5 +echo "configure:4426: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4274,54 +4467,46 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then lt_cv_dlopen="dlopen" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:4279: checking for shl_load" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:4472: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* 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(); +char dlopen(); int main() { - -/* 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) -choke me -#else -shl_load(); -#endif - +dlopen() ; return 0; } EOF -if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_shl_load=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_shl_load=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - lt_cv_dlopen="shl_load" + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:4325: checking for dlopen in -lsvld" >&5 +echo "configure:4510: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4329,7 +4514,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4358,27 +4543,27 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:4363: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` +echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +echo "configure:4548: checking for dld_link in -ldld" >&5 +ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4398,13 +4583,16 @@ else echo "$ac_t""no" 1>&6 fi + +fi + fi - + fi - + fi @@ -4431,7 +4619,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4435: checking whether a program can dlopen itself" >&5 +echo "configure:4623: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4441,7 +4629,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4525,7 +4713,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:4529: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:4717: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4535,7 +4723,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -4645,14 +4833,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:4649: checking whether -lc should be explicitly linked in" >&5 +echo "configure:4837: checking whether -lc should be explicitly linked in" >&5 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -4665,7 +4853,7 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:4669: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:4857: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then lt_cv_archive_cmds_need_lc=no else @@ -4719,6 +4907,7 @@ if test -f "$ltmain"; then old_striplib striplib file_magic_cmd export_symbols_cmds \ deplibs_check_method allow_undefined_flag no_undefined_flag \ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + global_symbol_to_c_name_address \ hardcode_libdir_flag_spec hardcode_libdir_separator \ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do @@ -4785,12 +4974,12 @@ SHELL=$lt_SHELL # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$need_lc - # Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$need_lc + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -4956,6 +5145,9 @@ global_symbol_pipe=$lt_global_symbol_pipe # Transform the output of nm in a proper C declaration global_symbol_to_cdecl=$lt_global_symbol_to_cdecl +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address + # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -5078,9 +5270,9 @@ EOF # return TRUE; # } # /* ltdll.c ends here */ - # This is a source program that is used to create import libraries - # on Windows for dlls which lack them. Don't remove nor modify the - # starting and closing comments + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments # /* impgen.c starts here */ # /* Copyright (C) 1999-2000 Free Software Foundation, Inc. # @@ -5256,7 +5448,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:5260: checking for ld used by GCC" >&5 +echo "configure:5452: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -5286,10 +5478,10 @@ echo "configure:5260: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:5290: checking for GNU ld" >&5 +echo "configure:5482: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:5293: checking for non-GNU ld" >&5 +echo "configure:5485: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5324,7 +5516,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:5328: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:5520: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5358,7 +5550,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6 -echo "configure:5362: checking for shared library run path origin" >&5 +echo "configure:5554: checking for shared library run path origin" >&5 if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5388,7 +5580,7 @@ echo "$ac_t""$acl_cv_rpath" 1>&6 echo $ac_n "checking how to link with librpathx""... $ac_c" 1>&6 -echo "configure:5392: checking how to link with librpathx" >&5 +echo "configure:5584: checking how to link with librpathx" >&5 if eval "test \"`echo '$''{'ac_cv_librpathx_libs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5698,6 +5890,29 @@ fi fi fi ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + ;; -l*) names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` ;; diff --git a/tests/xg-test1.ok.po b/tests/xg-test1.ok.po index 87e4d562b..5bd4ade9e 100644 --- a/tests/xg-test1.ok.po +++ b/tests/xg-test1.ok.po @@ -103,6 +103,8 @@ msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" " --strict write out strict Uniforum conforming .po file\n" " -w, --width=NUMBER set output page width\n" +" --no-wrap do not break long message lines, longer than\n" +" the output page width, into several lines\n" " -s, --sort-output generate sorted output\n" " -F, --sort-by-file sort output by file location\n" " --omit-header don't write header with `msgid \"\"' entry\n"