summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2001-03-30 12:35:36 +0000
committerBruno Haible <bruno@clisp.org>2001-03-30 12:35:36 +0000
commit823080739341685f874817d27a175ba10596f630 (patch)
tree5573968e7822e4bc633a7696ba8907063e859534
parent8af4939edd1d579b9819c71d212c1acd14ea51dd (diff)
downloadexternal_gettext-823080739341685f874817d27a175ba10596f630.zip
external_gettext-823080739341685f874817d27a175ba10596f630.tar.gz
external_gettext-823080739341685f874817d27a175ba10596f630.tar.bz2
Regenerated.
Diffstat
-rw-r--r--Makefile.in15
-rw-r--r--aclocal.m486
-rw-r--r--config.h.in12
-rwxr-xr-xconfigure545
-rw-r--r--doc/gettext.info189
-rw-r--r--doc/gettext.info-159
-rw-r--r--doc/gettext.info-2274
-rw-r--r--doc/gettext.info-3256
-rw-r--r--doc/gettext.info-4341
-rw-r--r--doc/gettext.info-5189
-rw-r--r--doc/version.texi2
-rw-r--r--intl/plural.c455
-rw-r--r--lib/Makefile.in2
-rw-r--r--m4/Makefile.in2
-rw-r--r--misc/Makefile.in4
-rw-r--r--po/da.gmobin17093 -> 15433 bytes
-rw-r--r--po/da.po79
-rw-r--r--po/de.gmobin27564 -> 36911 bytes
-rw-r--r--po/el.gmobin28705 -> 27048 bytes
-rw-r--r--po/el.po79
-rw-r--r--po/en@boldquot.gmobin32671 -> 34856 bytes
-rw-r--r--po/en@quot.gmobin32127 -> 34312 bytes
-rw-r--r--po/es.gmobin29497 -> 27532 bytes
-rw-r--r--po/es.po79
-rw-r--r--po/fr.gmobin27433 -> 25804 bytes
-rw-r--r--po/fr.po79
-rw-r--r--po/gettext.pot81
-rw-r--r--po/ja.gmobin29296 -> 27691 bytes
-rw-r--r--po/ja.po79
-rw-r--r--po/ko.gmobin16698 -> 14880 bytes
-rw-r--r--po/ko.po79
-rw-r--r--po/nl.gmobin17538 -> 15871 bytes
-rw-r--r--po/nl.po79
-rw-r--r--po/nn.gmobin5344 -> 5387 bytes
-rw-r--r--po/nn.po79
-rw-r--r--po/no.gmobin20549 -> 20527 bytes
-rw-r--r--po/no.po79
-rw-r--r--po/pl.gmobin26592 -> 24987 bytes
-rw-r--r--po/pl.po79
-rw-r--r--po/pt.gmobin10878 -> 10882 bytes
-rw-r--r--po/pt.po79
-rw-r--r--po/sl.gmobin9045 -> 9133 bytes
-rw-r--r--po/sl.po79
-rw-r--r--po/sv.gmobin16984 -> 15338 bytes
-rw-r--r--po/sv.po79
-rw-r--r--po/tr.gmobin26662 -> 24954 bytes
-rw-r--r--po/tr.po79
-rw-r--r--src/Makefile.in20
-rw-r--r--tests/Makefile.in19
49 files changed, 2038 insertions, 1619 deletions
diff --git a/Makefile.in b/Makefile.in
index 81fe3af..0abf82f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,6 +69,7 @@ EMACS = @EMACS@
EXEEXT = @EXEEXT@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
@@ -102,8 +103,7 @@ gettextsrc_DATA = ABOUT-NLS
SUBDIRS = doc intl lib src po m4 misc tests
-MAINTAINERCLEANFILES = djgpp/README djgpp/config.sed djgpp/fnchange.lst
-EXTRA_DIST = BUGS DISCLAIM README.gemtext aclocal.sh djgpp/Makefile.maint djgpp/README.in djgpp/config.bat djgpp/config.in djgpp/config.site djgpp/edtests.bat djgpp/fnchange.in djgpp/tscript.sed os2/README.os2 os2/os2.diff $(MAINTAINERCLEANFILES)
+EXTRA_DIST = BUGS DISCLAIM README.gemtext aclocal.sh djgpp/Makefile.maint djgpp/README.in djgpp/README djgpp/config.bat djgpp/config.in djgpp/config.sed djgpp/config.site djgpp/edtests.bat djgpp/fnchange.in djgpp/fnchange.lst djgpp/tscript.sed os2/README.os2 os2/os2.diff
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -130,11 +130,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/gettext.m4 \
- m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 \
- m4/lcmessage.m4 m4/libtool.m4 m4/progtest.m4 \
- m4/setlocale.m4 m4/signed.m4 m4/uintmax_t.m4 \
- m4/ulonglong.m4
+$(ACLOCAL_M4): configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/getline.m4 \
+ m4/gettext.m4 m4/iconv.m4 m4/inttypes_h.m4 \
+ m4/isc-posix.m4 m4/lcmessage.m4 m4/libtool.m4 \
+ m4/progtest.m4 m4/setlocale.m4 m4/signed.m4 \
+ m4/uintmax_t.m4 m4/ulonglong.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -381,7 +381,6 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-recursive
diff --git a/aclocal.m4 b/aclocal.m4
index 51a0275..7304541 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -671,6 +671,49 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
fi
])
+#serial 4
+
+dnl See if there's a working, system-supplied version of the getline function.
+dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems
+dnl have a function by that name in -linet that doesn't have anything
+dnl to do with the function we need.
+AC_DEFUN([AM_FUNC_GETLINE],
+[dnl
+ am_getline_needs_run_time_check=no
+ AC_CHECK_FUNC(getline,
+ dnl Found it in some library. Verify that it works.
+ am_getline_needs_run_time_check=yes,
+ am_cv_func_working_getline=no)
+ if test $am_getline_needs_run_time_check = yes; then
+ AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline,
+ [echo fooN |tr -d '\012'|tr N '\012' > conftest.data
+ AC_TRY_RUN([
+# include <stdio.h>
+# include <sys/types.h>
+# include <string.h>
+ int main ()
+ { /* Based on a test program from Karl Heuer. */
+ char *line = NULL;
+ size_t siz = 0;
+ int len;
+ FILE *in = fopen ("./conftest.data", "r");
+ if (!in)
+ return 1;
+ len = getline (&line, &siz, in);
+ exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+ }
+ ], am_cv_func_working_getline=yes dnl The library version works.
+ , am_cv_func_working_getline=no dnl The library version does NOT work.
+ , am_cv_func_working_getline=no dnl We're cross compiling.
+ )])
+ fi
+
+ if test $am_cv_func_working_getline = no; then
+ LIBOBJS="$LIBOBJS getline.${ac_objext}"
+ AC_SUBST(LIBOBJS)
+ fi
+])
+
dnl From Jim Meyering. Use this if you use the GNU error.[ch].
dnl FIXME: Migrate into libit
@@ -871,21 +914,52 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
fi
fi
- # We need to process the po/ directory.
+ dnl We need to process the po/ directory.
POSUB=po
fi
AC_OUTPUT_COMMANDS(
- [case " $CONFIG_FILES " in *" po/Makefile.in "*)
+ [case " $CONFIG_FILES " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac])
- # If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- # to 'yes' because some of the testsuite requires it.
+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+ dnl to 'yes' because some of the testsuite requires it.
if test "$PACKAGE" = gettext; then
BUILD_INCLUDED_LIBINTL=yes
fi
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+ dnl because plural.y uses bison specific features. It requires at least
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+ dnl compile.
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+ dnl the rule in general Makefile. Now, some people carelessly touch the
+ dnl files or have a broken "make" program, hence the plural.c rule will
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+ dnl present or too old.
+ AC_CHECK_PROGS([INTLBISON], [bison])
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ dnl Found it, now check the version.
+ AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+ 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;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ AC_MSG_RESULT([$ac_prog_version])
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
+
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
dnl in configure.in.
@@ -1063,9 +1137,9 @@ dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable libiconv installed).
+ dnl those with the standalone portable GNU libiconv installed).
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
- am_cv_func_iconv="no, consider installing libiconv"
+ am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
diff --git a/config.h.in b/config.h.in
index b03151b..1bd0cdd 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
/* Special definitions, processed by autoheader.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation.
+ Copyright (C) 1995-1998, 2001 Free Software Foundation.
Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
/* Default value for alignment of strings in .mo file. */
@@ -85,9 +85,6 @@
/* Define if you have the getdelim function. */
#undef HAVE_GETDELIM
-/* Define if you have the getline function. */
-#undef HAVE_GETLINE
-
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
@@ -261,13 +258,6 @@
# define INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177\\:."
#endif
-/* Length from which starting on warnings about too long strings are given.
- Several systems have limits for strings itself, more have problems with
- strings in their tools (important here: gencat). 1024 bytes is a
- conservative limit. Because many translation let the message size grow
- (German translations are always bigger) choose a length < 1024. */
-#define WARN_ID_LEN 900
-
/* This is the page width for the message_print function. It should
not be set to more than 79 characters (Emacs users will appreciate
it). It is used to wrap the msgid and msgstr strings, and also to
diff --git a/configure b/configure
index 3ca7262..ee6d5a4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.17
+# From configure.in Revision: 1.20
@@ -155,6 +155,10 @@
+#serial 4
+
+
+
@@ -783,7 +787,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# 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:787: checking for a BSD compatible install" >&5
+echo "configure:791: 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
@@ -836,7 +840,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:840: checking whether build environment is sane" >&5
+echo "configure:844: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -893,7 +897,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:897: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:901: 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
@@ -939,7 +943,7 @@ EOF
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:943: checking for working aclocal" >&5
+echo "configure:947: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -952,7 +956,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:956: checking for working autoconf" >&5
+echo "configure:960: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -965,7 +969,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:969: checking for working automake" >&5
+echo "configure:973: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -978,7 +982,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:982: checking for working autoheader" >&5
+echo "configure:986: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -991,7 +995,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:995: checking for working makeinfo" >&5
+echo "configure:999: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -1013,7 +1017,7 @@ ALL_LINGUAS="da de el en@quot en@boldquot es fr ja ko nl nn no pl pt sl sv tr"
# 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:1017: checking for $ac_word" >&5
+echo "configure:1021: 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
@@ -1043,7 +1047,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:1047: checking for $ac_word" >&5
+echo "configure:1051: 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
@@ -1094,7 +1098,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:1098: checking for $ac_word" >&5
+echo "configure:1102: 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
@@ -1126,7 +1130,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1130: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1134: 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.
@@ -1137,12 +1141,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1141 "configure"
+#line 1145 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1150: \"$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
@@ -1168,12 +1172,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:1172: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1176: 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:1177: checking whether we are using GNU C" >&5
+echo "configure:1181: 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
@@ -1182,7 +1186,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1186: \"$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:1190: \"$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
@@ -1201,7 +1205,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:1205: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1209: 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
@@ -1244,7 +1248,7 @@ fi
# 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:1248: checking for a BSD compatible install" >&5
+echo "configure:1252: 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
@@ -1301,7 +1305,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:1305: checking for $ac_word" >&5
+echo "configure:1309: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1339,7 +1343,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:1343: checking host system type" >&5
+echo "configure:1347: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1362,7 +1366,7 @@ echo "$ac_t""$host" 1>&6
echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1366: checking for strerror in -lcposix" >&5
+echo "configure:1370: 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
@@ -1370,7 +1374,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1374 "configure"
+#line 1378 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1381,7 +1385,7 @@ int main() {
strerror()
; return 0; }
EOF
-if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1389: \"$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
@@ -1405,13 +1409,13 @@ fi
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1409: checking for object suffix" >&5
+echo "configure:1413: 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:1415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
@@ -1429,12 +1433,12 @@ OBJEXT=$ac_cv_objext
ac_objext=$ac_cv_objext
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1433: checking for Cygwin environment" >&5
+echo "configure:1437: 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 <<EOF
-#line 1438 "configure"
+#line 1442 "configure"
#include "confdefs.h"
int main() {
@@ -1445,7 +1449,7 @@ int main() {
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1462,19 +1466,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:1466: checking for mingw32 environment" >&5
+echo "configure:1470: 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 <<EOF
-#line 1471 "configure"
+#line 1475 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1493,7 +1497,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1497: checking for executable suffix" >&5
+echo "configure:1501: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1503,7 +1507,7 @@ else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -1594,7 +1598,7 @@ else
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1598: checking build system type" >&5
+echo "configure:1602: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1614,7 +1618,7 @@ echo "$ac_t""$build" 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:1618: checking for $ac_word" >&5
+echo "configure:1622: 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
@@ -1653,7 +1657,7 @@ ac_prog=ld
if test "$ac_cv_prog_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:1657: checking for ld used by GCC" >&5
+echo "configure:1661: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1677,10 +1681,10 @@ echo "configure:1657: 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:1681: checking for GNU ld" >&5
+echo "configure:1685: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1684: checking for non-GNU ld" >&5
+echo "configure:1688: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1715,7 +1719,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:1719: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1723: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1731,7 +1735,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1735: checking for BSD-compatible nm" >&5
+echo "configure:1739: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1767,7 +1771,7 @@ NM="$ac_cv_path_NM"
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1771: checking whether ln -s works" >&5
+echo "configure:1775: 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
@@ -1816,8 +1820,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 1820 "configure"' > conftest.$ac_ext
- if { (eval echo configure:1821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 1824 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
@@ -1838,19 +1842,19 @@ case "$lt_target" in
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1842: checking whether the C compiler needs -belf" >&5
+echo "configure:1846: 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
cat > conftest.$ac_ext <<EOF
-#line 1847 "configure"
+#line 1851 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1858: \"$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
@@ -1959,7 +1963,7 @@ EOF
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1963: checking how to run the C preprocessor" >&5
+echo "configure:1967: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1974,13 +1978,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1982 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1988: \"$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
:
@@ -1991,13 +1995,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1995 "configure"
+#line 1999 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2005: \"$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
:
@@ -2008,13 +2012,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2016 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2022: \"$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
:
@@ -2039,12 +2043,12 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2043: checking for ANSI C header files" >&5
+echo "configure:2047: 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 <<EOF
-#line 2048 "configure"
+#line 2052 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2052,7 +2056,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2060: \"$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*
@@ -2069,7 +2073,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
-#line 2073 "configure"
+#line 2077 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2087,7 +2091,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
-#line 2091 "configure"
+#line 2095 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2108,7 +2112,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2112 "configure"
+#line 2116 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2119,7 +2123,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2146,17 +2150,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:2150: checking for $ac_hdr" >&5
+echo "configure:2154: 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
-#line 2155 "configure"
+#line 2159 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2164: \"$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*
@@ -2184,12 +2188,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2188: checking for working const" >&5
+echo "configure:2192: 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 <<EOF
-#line 2193 "configure"
+#line 2197 "configure"
#include "confdefs.h"
int main() {
@@ -2238,7 +2242,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2259,21 +2263,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2263: checking for inline" >&5
+echo "configure:2267: 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 <<EOF
-#line 2270 "configure"
+#line 2274 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -2300,19 +2304,19 @@ esac
echo $ac_n "checking for signed""... $ac_c" 1>&6
-echo "configure:2304: checking for signed" >&5
+echo "configure:2308: 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 <<EOF
-#line 2309 "configure"
+#line 2313 "configure"
#include "confdefs.h"
int main() {
signed char x;
; return 0; }
EOF
-if { (eval echo configure:2316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
bh_cv_c_signed=yes
else
@@ -2334,12 +2338,12 @@ EOF
echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6
-echo "configure:2338: checking whether backslash-a works in strings" >&5
+echo "configure:2342: 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 <<EOF
-#line 2343 "configure"
+#line 2347 "configure"
#include "confdefs.h"
int main() {
@@ -2353,7 +2357,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_backslash_a=yes
else
@@ -2375,12 +2379,12 @@ EOF
echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
-echo "configure:2379: checking for unsigned long long" >&5
+echo "configure:2383: 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 <<EOF
-#line 2384 "configure"
+#line 2388 "configure"
#include "confdefs.h"
unsigned long long ull = 1; int i = 63;
int main() {
@@ -2388,7 +2392,7 @@ unsigned long long ullmax = (unsigned long long) -1;
return ull << i | ull >> i | ullmax / ull | ullmax % ull;
; return 0; }
EOF
-if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2396: \"$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
@@ -2409,12 +2413,12 @@ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2413: checking for off_t" >&5
+echo "configure:2417: 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 <<EOF
-#line 2418 "configure"
+#line 2422 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2442,12 +2446,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2446: checking for size_t" >&5
+echo "configure:2450: 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 <<EOF
-#line 2451 "configure"
+#line 2455 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2475,19 +2479,19 @@ EOF
fi
echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
-echo "configure:2479: checking for ptrdiff_t" >&5
+echo "configure:2483: 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 <<EOF
-#line 2484 "configure"
+#line 2488 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
ptrdiff_t p
; return 0; }
EOF
-if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_type_ptrdiff_t=yes
else
@@ -2509,12 +2513,12 @@ EOF
echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:2513: checking for inttypes.h" >&5
+echo "configure:2517: 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 <<EOF
-#line 2518 "configure"
+#line 2522 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <inttypes.h>
@@ -2522,7 +2526,7 @@ int main() {
uintmax_t i = (uintmax_t) -1;
; return 0; }
EOF
-if { (eval echo configure:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
jm_ac_cv_header_inttypes_h=yes
else
@@ -2559,19 +2563,19 @@ EOF
# 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:2563: checking for working alloca.h" >&5
+echo "configure:2567: 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 <<EOF
-#line 2568 "configure"
+#line 2572 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:2575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2579: \"$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
@@ -2592,12 +2596,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2596: checking for alloca" >&5
+echo "configure:2600: 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 <<EOF
-#line 2601 "configure"
+#line 2605 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -2625,7 +2629,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2633: \"$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
@@ -2657,12 +2661,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2661: checking whether alloca needs Cray hooks" >&5
+echo "configure:2665: 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 <<EOF
-#line 2666 "configure"
+#line 2670 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -2687,12 +2691,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:2691: checking for $ac_func" >&5
+echo "configure:2695: 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 <<EOF
-#line 2696 "configure"
+#line 2700 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2715,7 +2719,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2723: \"$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
@@ -2742,7 +2746,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2746: checking stack direction for C alloca" >&5
+echo "configure:2750: 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
@@ -2750,7 +2754,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2754 "configure"
+#line 2758 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2769,7 +2773,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2777: \"$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
@@ -2791,12 +2795,12 @@ EOF
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2795: checking for vprintf" >&5
+echo "configure:2799: 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 <<EOF
-#line 2800 "configure"
+#line 2804 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -2819,7 +2823,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2827: \"$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
@@ -2843,12 +2847,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2847: checking for _doprnt" >&5
+echo "configure:2851: 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 <<EOF
-#line 2852 "configure"
+#line 2856 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -2871,7 +2875,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2879: \"$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
@@ -2898,12 +2902,12 @@ fi
for ac_func in getcwd mblen memcpy strchr strerror uname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2902: checking for $ac_func" >&5
+echo "configure:2906: 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 <<EOF
-#line 2907 "configure"
+#line 2911 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2926,7 +2930,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2934: \"$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
@@ -2950,16 +2954,16 @@ else
fi
done
-for ac_func in getline memmove memset stpcpy stpncpy strcspn \
-strncasecmp strstr strtoul vasprintf
+for ac_func in memmove memset stpcpy stpncpy strcspn \
+strcasecmp strncasecmp strstr strtoul vasprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2958: checking for $ac_func" >&5
+echo "configure:2962: 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 <<EOF
-#line 2963 "configure"
+#line 2967 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2982,7 +2986,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2990: \"$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
@@ -3008,16 +3012,118 @@ fi
done
-if test $ac_cv_func_getline != yes; then
+ am_getline_needs_run_time_check=no
+ echo $ac_n "checking for getline""... $ac_c" 1>&6
+echo "configure:3018: 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 <<EOF
+#line 3023 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char getline(); below. */
+#include <assert.h>
+/* 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 getline();
+
+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_getline) || defined (__stub___getline)
+choke me
+#else
+getline();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3046: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_getline=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'getline`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ am_getline_needs_run_time_check=yes
+else
+ echo "$ac_t""no" 1>&6
+am_cv_func_working_getline=no
+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:3068: 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
+ echo fooN |tr -d '\012'|tr N '\012' > conftest.data
+ if test "$cross_compiling" = yes; then
+ am_cv_func_working_getline=no
+else
+ cat > conftest.$ac_ext <<EOF
+#line 3077 "configure"
+#include "confdefs.h"
+
+# include <stdio.h>
+# include <sys/types.h>
+# include <string.h>
+ int main ()
+ { /* Based on a test program from Karl Heuer. */
+ char *line = NULL;
+ size_t siz = 0;
+ int len;
+ FILE *in = fopen ("./conftest.data", "r");
+ if (!in)
+ return 1;
+ len = getline (&line, &siz, in);
+ exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+ }
+
+EOF
+if { (eval echo configure:3096: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ am_cv_func_working_getline=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$am_cv_func_working_getline" 1>&6
+ fi
+
+ if test $am_cv_func_working_getline = no; then
+ LIBOBJS="$LIBOBJS getline.${ac_objext}"
+
+ fi
+
+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:3016: checking for $ac_func" >&5
+echo "configure:3122: 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 <<EOF
-#line 3021 "configure"
+#line 3127 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3040,7 +3146,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3150: \"$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
@@ -3067,12 +3173,12 @@ done
fi
echo $ac_n "checking for parse_printf_format""... $ac_c" 1>&6
-echo "configure:3071: checking for parse_printf_format" >&5
+echo "configure:3177: checking for parse_printf_format" >&5
if eval "test \"`echo '$''{'ac_cv_func_parse_printf_format'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3076 "configure"
+#line 3182 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char parse_printf_format(); below. */
@@ -3095,7 +3201,7 @@ parse_printf_format();
; return 0; }
EOF
-if { (eval echo configure:3099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_parse_printf_format=yes"
else
@@ -3125,19 +3231,19 @@ else
fi
echo $ac_n "checking for error_at_line""... $ac_c" 1>&6
-echo "configure:3129: checking for error_at_line" >&5
+echo "configure:3235: 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 <<EOF
-#line 3134 "configure"
+#line 3240 "configure"
#include "confdefs.h"
int main() {
error_at_line(0, 0, "", 0, "");
; return 0; }
EOF
-if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3247: \"$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
@@ -3160,17 +3266,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:3164: checking for $ac_hdr" >&5
+echo "configure:3270: 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
-#line 3169 "configure"
+#line 3275 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3280: \"$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*
@@ -3197,13 +3303,13 @@ fi
done
echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6
-echo "configure:3201: checking for setlocale declaration" >&5
+echo "configure:3307: 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 <<EOF
-#line 3207 "configure"
+#line 3313 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3222,7 +3328,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_proto_setlocale_arg1=""
else
@@ -3248,17 +3354,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:3252: checking for $ac_hdr" >&5
+echo "configure:3358: 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
-#line 3257 "configure"
+#line 3363 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3368: \"$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*
@@ -3287,12 +3393,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3291: checking for $ac_func" >&5
+echo "configure:3397: 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 <<EOF
-#line 3296 "configure"
+#line 3402 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3315,7 +3421,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3425: \"$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
@@ -3340,7 +3446,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3344: checking for working mmap" >&5
+echo "configure:3450: 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
@@ -3348,7 +3454,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3458 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3488,7 +3594,7 @@ main()
}
EOF
-if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3598: \"$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
@@ -3516,17 +3622,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:3520: checking for $ac_hdr" >&5
+echo "configure:3626: 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
-#line 3525 "configure"
+#line 3631 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3636: \"$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*
@@ -3557,12 +3663,12 @@ setenv setlocale stpcpy strchr strcasecmp strdup tsearch \
__argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3561: checking for $ac_func" >&5
+echo "configure:3667: 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 <<EOF
-#line 3566 "configure"
+#line 3672 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3585,7 +3691,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3695: \"$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
@@ -3612,15 +3718,15 @@ done
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:3616: checking for iconv" >&5
+echo "configure:3722: checking for iconv" >&5
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- am_cv_func_iconv="no, consider installing libiconv"
+ am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
cat > conftest.$ac_ext <<EOF
-#line 3624 "configure"
+#line 3730 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
@@ -3630,7 +3736,7 @@ iconv_t cd = iconv_open("","");
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_func_iconv=yes
else
@@ -3642,7 +3748,7 @@ rm -f conftest*
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
cat > conftest.$ac_ext <<EOF
-#line 3646 "configure"
+#line 3752 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
@@ -3652,7 +3758,7 @@ iconv_t cd = iconv_open("","");
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3762: \"$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
@@ -3673,13 +3779,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
EOF
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:3677: checking for iconv declaration" >&5
+echo "configure:3783: 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 <<EOF
-#line 3683 "configure"
+#line 3789 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3698,7 +3804,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:3702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_proto_iconv_arg1=""
else
@@ -3727,19 +3833,19 @@ EOF
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:3731: checking for nl_langinfo and CODESET" >&5
+echo "configure:3837: 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 <<EOF
-#line 3736 "configure"
+#line 3842 "configure"
#include "confdefs.h"
#include <langinfo.h>
int main() {
char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_langinfo_codeset=yes
else
@@ -3762,19 +3868,19 @@ EOF
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3766: checking for LC_MESSAGES" >&5
+echo "configure:3872: 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 <<EOF
-#line 3771 "configure"
+#line 3877 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:3778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3884: \"$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
@@ -3795,7 +3901,7 @@ EOF
fi
fi
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3799: checking whether NLS is requested" >&5
+echo "configure:3905: 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"
@@ -3816,7 +3922,7 @@ fi
EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3820: checking whether included gettext is requested" >&5
+echo "configure:3926: 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"
@@ -3836,17 +3942,17 @@ fi
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3840: checking for libintl.h" >&5
+echo "configure:3946: checking for libintl.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
-#line 3845 "configure"
+#line 3951 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3956: \"$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*
@@ -3863,12 +3969,12 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:3867: checking for GNU gettext in libc" >&5
+echo "configure:3973: 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 <<EOF
-#line 3872 "configure"
+#line 3978 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -3877,7 +3983,7 @@ bindtextdomain ("", "");
return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3987: \"$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
@@ -3893,14 +3999,14 @@ echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6
if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:3897: checking for GNU gettext in libintl" >&5
+echo "configure:4003: 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
gt_save_LIBS="$LIBS"
LIBS="$LIBS -lintl"
cat > conftest.$ac_ext <<EOF
-#line 3904 "configure"
+#line 4010 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -3909,7 +4015,7 @@ bindtextdomain ("", "");
return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4019: \"$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
@@ -3934,7 +4040,7 @@ EOF
# 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:3938: checking for $ac_word" >&5
+echo "configure:4044: 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
@@ -3968,12 +4074,12 @@ fi
for ac_func in dcgettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3972: checking for $ac_func" >&5
+echo "configure:4078: 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 <<EOF
-#line 3977 "configure"
+#line 4083 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3996,7 +4102,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4106: \"$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
@@ -4023,7 +4129,7 @@ done
# 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:4027: checking for $ac_word" >&5
+echo "configure:4133: 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
@@ -4059,7 +4165,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:4063: checking for $ac_word" >&5
+echo "configure:4169: 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
@@ -4112,7 +4218,7 @@ fi
# 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:4116: checking for $ac_word" >&5
+echo "configure:4222: 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
@@ -4146,7 +4252,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:4150: checking for $ac_word" >&5
+echo "configure:4256: 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
@@ -4182,7 +4288,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:4186: checking for $ac_word" >&5
+echo "configure:4292: 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
@@ -4234,18 +4340,67 @@ fi
fi
fi
- # We need to process the po/ directory.
- POSUB=po
+ POSUB=po
fi
- # If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- # to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext; then
+ if test "$PACKAGE" = gettext; then
BUILD_INCLUDED_LIBINTL=yes
fi
+ for ac_prog in bison
+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:4358: 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
+ if test -n "$INTLBISON"; then
+ ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_INTLBISON="$ac_prog"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+INTLBISON="$ac_cv_prog_INTLBISON"
+if test -n "$INTLBISON"; then
+ echo "$ac_t""$INTLBISON" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INTLBISON" && break
+done
+
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ echo $ac_n "checking version of bison""... $ac_c" 1>&6
+echo "configure:4391: 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;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ echo "$ac_t""$ac_prog_version" 1>&6
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
+
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
@@ -4273,7 +4428,7 @@ fi
LINGUAS=
else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4277: checking for catalogs to be installed" >&5
+echo "configure:4432: checking for catalogs to be installed" >&5
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
@@ -4337,7 +4492,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:4341: checking for $ac_word" >&5
+echo "configure:4496: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4375,7 +4530,7 @@ test -n "$EMACS" || EMACS="no"
if test $EMACS != "no"; then
echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:4379: checking where .elc files should go" >&5
+echo "configure:4534: checking where .elc files should go" >&5
lispdir="\$(datadir)/emacs/site-lisp"
emacs_flavor=`echo "$EMACS" | sed -e 's,^.*/,,'`
if test "x$prefix" = "xNONE"; then
@@ -4586,6 +4741,7 @@ s%@USE_NLS@%$USE_NLS%g
s%@MSGFMT@%$MSGFMT%g
s%@GMSGFMT@%$GMSGFMT%g
s%@XGETTEXT@%$XGETTEXT%g
+s%@INTLBISON@%$INTLBISON%g
s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
s%@CATALOGS@%$CATALOGS%g
@@ -4819,7 +4975,7 @@ cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-case " $CONFIG_FILES " in *" po/Makefile.in "*)
+case " $CONFIG_FILES " in *" po/Makefile.in "* | *" po/Makefile.in:"*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac
@@ -4832,6 +4988,9 @@ case " $CONFIG_FILES " in *" po/Makefile.in "*)
sed -e "s/list='\\\$(lisp_LISP)'; for/list='\$(lisp_LISP)'; test '\$(EMACS)' = no || for/" \
< misc/Makefile > misc/Makefile.tmp
mv misc/Makefile.tmp misc/Makefile
+ sed -e '/^EXTRA_PROGRAMS = /{' -e 's/\([a-z0-9_]\)\( \)/\1\$(EXEEXT)\2/g' -e 's/\([a-z0-9_]\)$/\1\$(EXEEXT)/g' -e '}' \
+ < tests/Makefile > tests/Makefile.tmp
+ mv tests/Makefile.tmp tests/Makefile
exit 0
EOF
diff --git a/doc/gettext.info b/doc/gettext.info
index cbc500f..c3d6cf3 100644
--- a/doc/gettext.info
+++ b/doc/gettext.info
@@ -33,103 +33,104 @@ translation approved by the Foundation.

Indirect:
gettext.info-1: 1411
-gettext.info-2: 49514
-gettext.info-3: 98183
-gettext.info-4: 147581
-gettext.info-5: 197084
+gettext.info-2: 48952
+gettext.info-3: 98371
+gettext.info-4: 147112
+gettext.info-5: 195688

Tag Table:
(Indirect)
Node: Top1411
-Node: Introduction6887
-Node: Why8743
-Ref: Why-Footnote-111833
-Node: Concepts11989
-Node: Aspects15402
-Node: Files21459
-Node: Overview23727
-Node: Basics34653
-Node: Installation35483
-Node: PO Files37450
-Ref: PO Files-Footnote-144462
-Node: Main PO Commands44574
-Node: Entry Positioning49514
-Node: Normalizing54765
-Node: Sources59217
-Node: Triggering60487
-Node: Mark Keywords63502
-Node: Marking67052
-Node: c-format74693
-Node: Special cases78443
-Node: Initial81305
-Node: xgettext Invocation81627
-Node: C Sources Context85455
-Node: Compendium90434
-Node: Updating91137
-Node: msgmerge Invocation91777
-Node: Translated Entries91951
-Node: Fuzzy Entries93242
-Node: Untranslated Entries96344
-Node: Obsolete Entries98183
-Node: Modifying Translations101315
-Node: Modifying Comments109133
-Node: Subedit113440
-Node: Auxiliary117217
-Node: Binaries120287
-Node: msgfmt Invocation120551
-Node: MO Files123177
-Node: Users131263
-Node: Matrix132744
-Node: Installers133947
-Node: End Users135117
-Node: Programmers135746
-Node: catgets136920
-Node: Interface to catgets138325
-Node: Problems with catgets140326
-Node: gettext141224
-Node: Interface to gettext142682
-Node: Ambiguities145024
-Node: Locating Catalogs147581
-Ref: Locating Catalogs-Footnote-1148728
-Ref: Locating Catalogs-Footnote-2148953
-Node: Charset conversion149102
-Node: Plural forms151544
-Ref: Plural forms-Footnote-1161320
-Node: GUI program problems161412
-Node: Optimized gettext166515
-Node: Comparison167848
-Node: Using libintl.a172120
-Node: gettext grok172891
-Node: Temp Programmers175523
-Node: Temp Implementations175963
-Node: Temp catgets177329
-Node: Temp WSI179016
-Node: Temp Notes181004
-Node: Translators181493
-Node: Trans Intro 0181872
-Node: Trans Intro 1184521
-Node: Discussions186385
-Node: Organization189541
-Node: Central Coordination191522
-Node: National Teams192650
-Node: Sub-Cultures195162
-Node: Organizational Ideas196081
-Node: Mailing Lists197084
-Node: Information Flow198887
-Node: Maintainers201020
-Node: Flat and Non-Flat202779
-Node: Prerequisites204540
-Node: gettextize Invocation208649
-Node: Adjusting Files212221
-Node: po/POTFILES.in213444
-Node: configure.in214383
-Node: aclocal216509
-Node: acconfig217688
-Node: Makefile218286
-Node: src/Makefile220474
-Node: Conclusion222871
-Node: History223361
-Node: References226821
-Node: Language Codes228376
+Node: Introduction6944
+Node: Why8800
+Ref: Why-Footnote-111890
+Node: Concepts12046
+Node: Aspects15459
+Node: Files21208
+Node: Overview23150
+Node: Basics34076
+Node: Installation34906
+Node: PO Files36873
+Ref: PO Files-Footnote-143885
+Node: Main PO Commands44012
+Node: Entry Positioning48952
+Node: Normalizing54203
+Node: Sources58655
+Node: Triggering59926
+Node: Mark Keywords62941
+Node: Marking66491
+Node: c-format74132
+Node: Special cases77882
+Node: Template80744
+Node: xgettext Invocation81096
+Node: Creating84900
+Node: Updating91212
+Node: msgmerge Invocation91965
+Node: Translated Entries92139
+Node: Fuzzy Entries93430
+Node: Untranslated Entries96532
+Node: Obsolete Entries98371
+Node: Modifying Translations101503
+Node: Modifying Comments109321
+Node: Subedit113628
+Node: C Sources Context117413
+Node: Auxiliary122380
+Node: Compendium125479
+Node: Binaries126175
+Node: msgfmt Invocation126439
+Node: MO Files129065
+Node: Users137151
+Node: Matrix138632
+Node: Installers139835
+Node: End Users141005
+Node: Programmers141634
+Node: catgets142808
+Node: Interface to catgets144213
+Node: Problems with catgets146214
+Node: gettext147112
+Node: Interface to gettext148570
+Node: Ambiguities150912
+Node: Locating Catalogs153469
+Ref: Locating Catalogs-Footnote-1154616
+Ref: Locating Catalogs-Footnote-2154841
+Node: Charset conversion154990
+Node: Plural forms157432
+Ref: Plural forms-Footnote-1167461
+Node: GUI program problems167553
+Node: Optimized gettext172656
+Node: Comparison173989
+Node: Using libintl.a178261
+Node: gettext grok179038
+Node: Temp Programmers181670
+Node: Temp Implementations182110
+Node: Temp catgets183476
+Node: Temp WSI185163
+Node: Temp Notes187151
+Node: Translators187640
+Node: Trans Intro 0188019
+Node: Trans Intro 1190668
+Node: Discussions192532
+Node: Organization195688
+Node: Central Coordination197669
+Node: National Teams198797
+Node: Sub-Cultures201309
+Node: Organizational Ideas202228
+Node: Mailing Lists203231
+Node: Information Flow205034
+Node: Maintainers207167
+Node: Flat and Non-Flat208926
+Node: Prerequisites210409
+Node: gettextize Invocation214518
+Node: Adjusting Files218090
+Node: po/POTFILES.in219313
+Node: configure.in220252
+Node: aclocal222378
+Node: acconfig223557
+Node: Makefile224155
+Node: src/Makefile226343
+Node: Conclusion228740
+Node: History229230
+Node: References232690
+Node: Language Codes234245

End Tag Table
diff --git a/doc/gettext.info-1 b/doc/gettext.info-1
index d7cdd42..df2989f 100644
--- a/doc/gettext.info-1
+++ b/doc/gettext.info-1
@@ -41,7 +41,8 @@ GNU `gettext' utilities
* Introduction:: Introduction
* Basics:: PO Files and PO Mode Basics
* Sources:: Preparing Program Sources
-* Initial:: Making the Initial PO File
+* Template:: Making the PO Template File
+* Creating:: Creating a New PO File
* Updating:: Updating Existing PO Files
* Binaries:: Producing Binary MO Files
* Users:: The User's View
@@ -78,11 +79,9 @@ Preparing Program Sources
* c-format:: Telling something about the following string
* Special cases:: Special Cases of Translatable Strings
-Making the Initial PO File
+Making the PO Template File
* xgettext Invocation:: Invoking the `xgettext' Program
-* C Sources Context:: C Sources Context
-* Compendium:: Using Translation Compendiums
Updating Existing PO Files
@@ -94,7 +93,9 @@ Updating Existing PO Files
* Modifying Translations:: Modifying Translations
* Modifying Comments:: Modifying Comments
* Subedit:: Mode for Editing Translations
+* C Sources Context:: C Sources Context
* Auxiliary:: Consulting Auxiliary PO Files
+* Compendium:: Using Translation Compendiums
Producing Binary MO Files
@@ -400,20 +401,18 @@ translate beyond output messages.
As we already stressed, translation is only one aspect of locales.
-Other internationalization aspects are not currently handled by GNU
-`gettext', but perhaps may be handled in future versions. There are
-many attributes that are needed to define a country's cultural
-conventions. These attributes include beside the country's native
-language, the formatting of the date and time, the representation of
-numbers, the symbols for currency, etc. These local "rules" are termed
-the country's locale. The locale represents the knowledge needed to
-support the country's native attributes.
+Other internationalization aspects are system services and are handled
+in GNU `libc'. There are many attributes that are needed to define a
+country's cultural conventions. These attributes include beside the
+country's native language, the formatting of the date and time, the
+representation of numbers, the symbols for currency, etc. These local
+"rules" are termed the country's locale. The locale represents the
+knowledge needed to support the country's native attributes.
There are a few major areas which may vary between countries and
hence, define what a locale must describe. The following list helps
putting multi-lingual messages into the proper context of other tasks
-related to locales, and also presents some other areas which GNU
-`gettext' might eventually tackle, maybe, one of these days.
+related to locales. See the GNU `libc' manual for details.
_Characters and Codesets_
The codeset most commonly used through out the USA and most English
@@ -460,13 +459,10 @@ _Messages_
users to easily change the language that the software uses to
communicate to the user.
- In the near future we see no chance that components of locale
-outside of message handling will be made available for use in other
-packages. The reason for this is that most modern systems provide a
-more or less reasonable support for at least some of the missing
-components. Another point is that the GNU `libc' and Linux will get a
-new and complete implementation of the whole locale functionality which
-could be adopted by system lacking a reasonable locale support.
+ Components of locale outside of message handling are standardized in
+the ISO C standard and the SUSV2 specification. GNU `libc' fully
+implements this, and most other modern systems provide a more or less
+reasonable support for at least some of the missing components.

File: gettext.info, Node: Files, Next: Overview, Prev: Aspects, Up: Introduction
@@ -500,15 +496,10 @@ often temporary PO files.
A few systems already offer tools for creating and handling MO files as
part of the Native Language Support coming with the system, but the
format of these MO files is often different from system to system, and
-non-portable. They do not necessary use `.mo' for file extensions, but
-since system libraries are also used for accessing these files, it
-works as long as the system is self-consistent about it. If GNU
-`gettext' is able to interface with the tools already provided with
-systems, it will consequently let these provided tools take care of
-generating the MO files. Or else, if such tools are not found or do
-not seem usable, GNU `gettext' will use its own ways and its own format
-for MO files. Files ending with `.gmo' are really MO files, when it is
-known that these files use the GNU format.
+non-portable. The tools already provided with these systems don't
+support all the features of GNU `gettext'. Therefore GNU `gettext'
+uses its own format for MO files. Files ending with `.gmo' are really
+MO files, when it is known that these files use the GNU format.

File: gettext.info, Node: Overview, Prev: Files, Up: Introduction
@@ -590,8 +581,8 @@ library functions are already contained in GNU libc. That is all you
have to change.
Once the C sources have been modified, the `xgettext' program is
-used to find and extract all translatable strings, and create an
-initial PO file out of all these. This `PACKAGE.pot' file contains all
+used to find and extract all translatable strings, and create a PO
+template file out of all these. This `PACKAGE.pot' file 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
@@ -919,8 +910,8 @@ be replaced unexpectedly when the PO file is given to `msgmerge'.
---------- Footnotes ----------
- (1) This limitation is not imposed by GNU `gettext', but comes from
-the `msgfmt' implementation on Solaris.
+ (1) This limitation is not imposed by GNU `gettext', but is for
+compatibility with the `msgfmt' implementation on Solaris.

File: gettext.info, Node: Main PO Commands, Next: Entry Positioning, Prev: PO Files, Up: Basics
diff --git a/doc/gettext.info-2 b/doc/gettext.info-2
index 36352bd..e480eba 100644
--- a/doc/gettext.info-2
+++ b/doc/gettext.info-2
@@ -240,7 +240,7 @@ normalization, to be documented in this manual, once these questions
settle.

-File: gettext.info, Node: Sources, Next: Initial, Prev: Basics, Up: Top
+File: gettext.info, Node: Sources, Next: Template, Prev: Basics, Up: Top
Preparing Program Sources
*************************
@@ -718,19 +718,20 @@ generally not very difficult. If it should be in any situation you can
use this second method in this situation.

-File: gettext.info, Node: Initial, Next: Updating, Prev: Sources, Up: Top
+File: gettext.info, Node: Template, Next: Creating, Prev: Sources, Up: Top
-Making the Initial PO File
-**************************
+Making the PO Template File
+***************************
+
+ After preparing the sources, the programmer creates a PO template
+file. This section explains how to use `xgettext' for this purpose.
* Menu:
* xgettext Invocation:: Invoking the `xgettext' Program
-* C Sources Context:: C Sources Context
-* Compendium:: Using Translation Compendiums

-File: gettext.info, Node: xgettext Invocation, Next: C Sources Context, Prev: Initial, Up: Initial
+File: gettext.info, Node: xgettext Invocation, Prev: Template, Up: Template
Invoking the `xgettext' Program
===============================
@@ -863,123 +864,162 @@ cases, like strings in preprocessor macros, ANSI concatenation of
adjacent strings, and escaped end of lines for continued strings.

-File: gettext.info, Node: C Sources Context, Next: Compendium, Prev: xgettext Invocation, Up: Initial
+File: gettext.info, Node: Creating, Next: Updating, Prev: Template, Up: Top
-C Sources Context
-=================
+Creating a New PO File
+**********************
- 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.
-
-`M-s'
- Display of a program source context selected by menu.
-
-`S'
- Add a directory to the search path for source files.
-
-`M-S'
- Delete a directory from the search path for source files.
-
- The commands `s' (`po-cycle-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 of particular reference among
-many, and displays that reference. It is best used with completion, if
-the translator types `<TAB>' 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.
+ When starting a new translation, the translator copies the
+`PACKAGE.pot' template file to a file called `LANG.po'. Then she
+modifies the initial comments and the header entry of this file.
-
-File: gettext.info, Node: Compendium, Prev: C Sources Context, Up: Initial
+ The initial comments "SOME DESCRIPTIVE TITLE", "YEAR" and "FIRST
+AUTHOR <EMAIL@ADDRESS>, YEAR" ought to be replaced by sensible
+information. This can be done in any text editor; if Emacs is used and
+it switched to PO mode automatically (because it has recognized the
+file's suffix), you can disable it by typing `M-x fundamental-mode'.
+
+ Modifying the header entry can already be done using PO mode: in
+Emacs, type `M-x po-mode RET' and then `RET' again to start editing the
+entry. You should fill in the following fields.
+
+Project-Id-Version
+ This is the name and version of the package.
+
+POT-Creation-Date
+ This has already been filled in by `xgettext'.
+
+PO-Revision-Date
+ You don't need to fill this in. It will be filled by the Emacs PO
+ mode when you save the file.
+
+Last-Translator
+ Fill in your name and email address (without double quotes).
+
+Language-Team
+ Fill in the English name of the language, and the email address of
+ the language team you are part of.
+
+ Before starting a translation, it is a good idea to get in touch
+ with your translation team, not only to make sure you don't do
+ duplicated work, but also to coordinate difficult linguistic
+ issues.
+
+ In the Free Translation Project, each translation team has its own
+ mailing list. The up-to-date list of teams can be found at the
+ Free Translation Project's homepage,
+ `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National
+ teams" area.
+
+Content-Type
+ Replace `CHARSET' with the character encoding used for your
+ language, in your locale, or UTF-8. This field is needed for
+ correct operation of the `msgmerge' and `msgfmt' programs, as well
+ as for users whose locale's character encoding differs from yours
+ (see *Note Charset conversion::).
+
+ 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 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 `libiconv'. These are: `ASCII', `ISO-8859-1',
+ `ISO-8859-2', `ISO-8859-3', `ISO-8859-4', `ISO-8859-5',
+ `ISO-8859-6', `ISO-8859-7', `ISO-8859-8', `ISO-8859-9',
+ `ISO-8859-13', `ISO-8859-15', `KOI8-R', `KOI8-U', `CP850',
+ `CP866', `CP874', `CP932', `CP949', `CP950', `CP1250', `CP1251',
+ `CP1252', `CP1253', `CP1254', `CP1255', `CP1256', `CP1257',
+ `GB2312', `EUC-JP', `EUC-KR', `EUC-TW', `BIG5', `BIG5HKSCS',
+ `GBK', `GB18030', `SJIS', `JOHAB', `TIS-620', `VISCII', `UTF-8'.
+
+ In the GNU system, the following encodings are frequently used for
+ the corresponding languages.
+
+ * `ISO-8859-1' for Afrikaans, Albanian, Basque, Catalan,
+ Dutch, English, Estonian, Faroese, Finnish, French,
+ Galician, German, Greenlandic, Icelandic, Indonesian, Irish,
+ Italian, Malay, Norwegian, Portuguese, Spanish, Swedish,
+
+ * `ISO-8859-2' for Croatian, Czech, Hungarian, Polish,
+ Romanian, Serbian, Slovak, Slovenian,
+
+ * `ISO-8859-3' for Maltese,
-Using Translation Compendiums
-=============================
+ * `ISO-8859-5' for Macedonian, Serbian,
- Compendiums are yet to be implemented.
+ * `ISO-8859-6' for Arabic,
- An incoming PO mode feature will let the translator maintain a
-compendium of already achieved translations. A "compendium" is a
-special PO file containing a set of translations recurring in many
-different packages. The translator will be given commands for adding
-entries to her compendium, and later initializing untranslated entries,
-or updating already translated entries, from translations kept in the
-compendium. For this to work, however, the compendium would have to be
-normalized. *Note Normalizing::.
+ * `ISO-8859-7' for Greek,
+
+ * `ISO-8859-8' for Hebrew,
+
+ * `ISO-8859-9' for Turkish,
+
+ * `ISO-8859-13' for Latvian, Lithuanian,
+
+ * `ISO-8859-15' for Basque, Catalan, Dutch, English, Finnish,
+ French, Galician, German, Irish, Italian, Portuguese,
+ Spanish, Swedish,
+
+ * `KOI8-R' for Russian,
+
+ * `KOI8-U' for Ukrainian,
+
+ * `CP1251' for Bulgarian, Byelorussian,
+
+ * `GB2312', `GBK', `GB18030' for simplified writing of Chinese,
+
+ * `BIG5', `BIG5HKSCS' for traditional writing of Chinese,
+
+ * `EUC-JP' for Japanese,
+
+ * `EUC-KR' for Korean,
+
+ * `TIS-620' for Thai,
+
+ * `UTF-8' for any language, including those listed above.
+
+ 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 encoding, instead of your locale's encoding. This is
+ because in UTF-8 the real quote characters can be represented
+ (single quote characters: U+2018, U+2019, double quote characters:
+ U+201C, U+201D), whereas none of ISO-8859-* charsets has them all.
+ Users in UTF-8 locales will see the real quote characters,
+ whereas users in ISO-8859-* locales will see the vertical
+ apostrophe and the vertical double quote instead (because that's
+ what the character set conversion will transliterate them to).
+
+ 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", "leftdoublequotemark",
+ "rightdoublequotemark", "singlelowquotemark", "doublelowquotemark".
+
+ Note that only recent versions of GNU Emacs support the UTF-8
+ encoding: Emacs 20 with Mule-UCS, and Emacs 21. As of January
+ 2001, XEmacs doesn't support the UTF-8 encoding.
+
+ The character encoding name can be written in either upper or
+ lower case. Usually upper case is preferred.
+
+Content-Transfer-Encoding
+ Set this to `8-bit'.
+
+Plural-Forms
+ This field is optional. It is only needed if the PO file has
+ plural forms. You can find them by searching for the
+ `msgid_plural' keyword. The format of the plural forms field is
+ described in *Note Plural forms::.

-File: gettext.info, Node: Updating, Next: Binaries, Prev: Initial, Up: Top
+File: gettext.info, Node: Updating, Next: Binaries, Prev: Creating, Up: Top
Updating Existing PO Files
**************************
@@ -994,7 +1034,9 @@ Updating Existing PO Files
* Modifying Translations:: Modifying Translations
* Modifying Comments:: Modifying Comments
* Subedit:: Mode for Editing Translations
+* C Sources Context:: C Sources Context
* Auxiliary:: Consulting Auxiliary PO Files
+* Compendium:: Using Translation Compendiums

File: gettext.info, Node: msgmerge Invocation, Next: Translated Entries, Prev: Updating, Up: Updating
diff --git a/doc/gettext.info-3 b/doc/gettext.info-3
index f25894d..f28d7b0 100644
--- a/doc/gettext.info-3
+++ b/doc/gettext.info-3
@@ -333,7 +333,7 @@ Emacs commands `C-y' (`yank') and `M-y' (`yank-pop') to get the
previous translation where she likes.

-File: gettext.info, Node: Subedit, Next: Auxiliary, Prev: Modifying Comments, Up: Updating
+File: gettext.info, Node: Subedit, Next: C Sources Context, Prev: Modifying Comments, Up: Updating
Details of Sub Edition
======================
@@ -410,7 +410,106 @@ subedits are automatically resumed one at a time, so she may decide for
each of them.

-File: gettext.info, Node: Auxiliary, Prev: Subedit, Up: Updating
+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.
+
+`M-s'
+ Display of a program source context selected by menu.
+
+`S'
+ Add a directory to the search path for source files.
+
+`M-S'
+ Delete a directory from the search path for source files.
+
+ The commands `s' (`po-cycle-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 of particular reference among
+many, and displays that reference. It is best used with completion, if
+the translator types `<TAB>' 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
=============================
@@ -476,6 +575,23 @@ 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 Compendiums
+=============================
+
+ Compendiums are yet to be implemented.
+
+ An incoming PO mode feature will let the translator maintain a
+compendium of already achieved translations. A "compendium" is a
+special PO file containing a set of translations recurring in many
+different packages. The translator will be given commands for adding
+entries to her compendium, and later initializing untranslated entries,
+or updating already translated entries, from translations kept in the
+compendium. For this to work, however, the compendium would have to be
+normalized. *Note Normalizing::.
+
+
File: gettext.info, Node: Binaries, Next: Users, Prev: Updating, Up: Top
Producing Binary MO Files
@@ -916,139 +1032,3 @@ chaos but one as the other fails in one aspect or the other. We don't
want to say that the other approach has no problems but they are far
more easily to manage.
-
-File: gettext.info, Node: gettext, Next: Comparison, Prev: catgets, Up: Programmers
-
-About `gettext'
-===============
-
- The definition of the `gettext' interface comes from a Uniforum
-proposal and it is followed by at least one major Unix vendor (Sun) in
-its last developments. It is not specified in any official standard,
-though.
-
- 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 is also a unique key needed, but this key is the message
-itself (how long or short it is). See *Note Comparison:: for a more
-detailed comparison of the two methods.
-
- The following section contains a rather detailed description of the
-interface. We make it that detailed because this is the interface we
-chose for the GNU `gettext' Library. Programmers interested in using
-this library will be interested in this description.
-
-* Menu:
-
-* Interface to gettext:: The interface
-* Ambiguities:: Solving ambiguities
-* Locating Catalogs:: Locating message catalog files
-* Charset conversion:: How to request conversion to Unicode
-* Plural forms:: Additional functions for handling plurals
-* GUI program problems:: Another technique for solving ambiguities
-* Optimized gettext:: Optimization of the *gettext functions
-
-
-File: gettext.info, Node: Interface to gettext, Next: Ambiguities, Prev: gettext, Up: gettext
-
-The Interface
--------------
-
- The minimal functionality an interface must have is a) to select a
-domain the strings are coming from (a single domain for all programs is
-not reasonable because its construction and maintenance is difficult,
-perhaps impossible) and b) to access a string in a selected domain.
-
- This is principally the description of the `gettext' interface. It
-has an global domain which unqualified usages reference. Of course this
-domain is selectable by the user.
-
- char *textdomain (const char *domain_name);
-
- This provides the possibility to change or query the current status
-of the current global domain of the `LC_MESSAGE' category. The
-argument is a null-terminated string, whose characters must be legal in
-the use in filenames. If the DOMAIN_NAME argument is `NULL', the
-function return the current value. If no value has been set before,
-the name of the default domain is returned: _messages_. Please note
-that although the return value of `textdomain' is of type `char *' no
-changing is allowed. It is also important to know that no checks of
-the availability are made. If the name is not available you will see
-this by the fact that no translations are provided.
-
-To use a domain set by `textdomain' the function
-
- char *gettext (const char *msgid);
-
- is to be used. This is the simplest reasonable form one can imagine.
-The translation of the string MSGID is returned if it is available in
-the current domain. If not available the argument itself is returned.
-If the argument is `NULL' the result is undefined.
-
- One things which should come into mind is that no explicit
-dependency to the used domain is given. The current value of the
-domain for the `LC_MESSAGES' locale is used. If this changes between
-two executions of the same `gettext' call in the program, both calls
-reference a different message catalog.
-
- For the easiest case, which is normally used in internationalized
-packages, once at the beginning of execution a call to `textdomain' is
-issued, setting the domain to a unique name, normally the package name.
-In the following code all strings which have to be translated are
-filtered through the gettext function. That's all, the package speaks
-your language.
-
-
-File: gettext.info, Node: Ambiguities, Next: Locating Catalogs, Prev: Interface to gettext, Up: gettext
-
-Solving Ambiguities
--------------------
-
- While this single name domain work good for most applications there
-might be the need to get translations from more than one domain. Of
-course one could switch between different domains with calls to
-`textdomain', but this is really not convenient nor is it fast. A
-possible situation could be one case discussing while this writing: all
-error messages of functions in the set of common used functions should
-go into a separate domain `error'. By this mean we would only need to
-translate them once.
-
-For this reasons there are two more functions to retrieve strings:
-
- char *dgettext (const char *domain_name, const char *msgid);
- char *dcgettext (const char *domain_name, const char *msgid,
- int category);
-
- Both take an additional argument at the first place, which
-corresponds to the argument of `textdomain'. The third argument of
-`dcgettext' allows to use another locale but `LC_MESSAGES'. But I
-really don't know where this can be useful. If the DOMAIN_NAME is
-`NULL' or CATEGORY has an value beside the known ones, the result is
-undefined. It should also be noted that this function is not part of
-the second known implementation of this function family, the one found
-in Solaris.
-
- A second ambiguity can arise by the fact, that perhaps more than one
-domain has the same name. This can be solved by specifying where the
-needed message catalog files can be found.
-
- char *bindtextdomain (const char *domain_name,
- const char *dir_name);
-
- Calling this function binds the given domain to a file in the
-specified directory (how this file is determined follows below).
-Especially a file in the systems default place is not favored against
-the specified file anymore (as it would be by solely using
-`textdomain'). A `NULL' pointer for the DIR_NAME parameter returns the
-binding associated with DOMAIN_NAME. If DOMAIN_NAME itself is `NULL'
-nothing happens and a `NULL' pointer is returned. Here again as for
-all the other functions is true that none of the return value must be
-changed!
-
- It is important to remember that relative path names for the
-DIR_NAME parameter can be trouble. Since the path is always computed
-relative to the current directory different results will be achieved
-when the program executes a `chdir' command. Relative paths should
-always be avoided to avoid dependencies and unreliabilities.
-
diff --git a/doc/gettext.info-4 b/doc/gettext.info-4
index bc0214e..8d710c7 100644
--- a/doc/gettext.info-4
+++ b/doc/gettext.info-4
@@ -31,6 +31,142 @@ versions, except that this permission notice may be stated in a
translation approved by the Foundation.

+File: gettext.info, Node: gettext, Next: Comparison, Prev: catgets, Up: Programmers
+
+About `gettext'
+===============
+
+ The definition of the `gettext' interface comes from a Uniforum
+proposal and it is followed by at least one major Unix vendor (Sun) in
+its last developments. It is not specified in any official standard,
+though.
+
+ 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 is also a unique key needed, but this key is the message
+itself (how long or short it is). See *Note Comparison:: for a more
+detailed comparison of the two methods.
+
+ The following section contains a rather detailed description of the
+interface. We make it that detailed because this is the interface we
+chose for the GNU `gettext' Library. Programmers interested in using
+this library will be interested in this description.
+
+* Menu:
+
+* Interface to gettext:: The interface
+* Ambiguities:: Solving ambiguities
+* Locating Catalogs:: Locating message catalog files
+* Charset conversion:: How to request conversion to Unicode
+* Plural forms:: Additional functions for handling plurals
+* GUI program problems:: Another technique for solving ambiguities
+* Optimized gettext:: Optimization of the *gettext functions
+
+
+File: gettext.info, Node: Interface to gettext, Next: Ambiguities, Prev: gettext, Up: gettext
+
+The Interface
+-------------
+
+ The minimal functionality an interface must have is a) to select a
+domain the strings are coming from (a single domain for all programs is
+not reasonable because its construction and maintenance is difficult,
+perhaps impossible) and b) to access a string in a selected domain.
+
+ This is principally the description of the `gettext' interface. It
+has an global domain which unqualified usages reference. Of course this
+domain is selectable by the user.
+
+ char *textdomain (const char *domain_name);
+
+ This provides the possibility to change or query the current status
+of the current global domain of the `LC_MESSAGE' category. The
+argument is a null-terminated string, whose characters must be legal in
+the use in filenames. If the DOMAIN_NAME argument is `NULL', the
+function return the current value. If no value has been set before,
+the name of the default domain is returned: _messages_. Please note
+that although the return value of `textdomain' is of type `char *' no
+changing is allowed. It is also important to know that no checks of
+the availability are made. If the name is not available you will see
+this by the fact that no translations are provided.
+
+To use a domain set by `textdomain' the function
+
+ char *gettext (const char *msgid);
+
+ is to be used. This is the simplest reasonable form one can imagine.
+The translation of the string MSGID is returned if it is available in
+the current domain. If not available the argument itself is returned.
+If the argument is `NULL' the result is undefined.
+
+ One things which should come into mind is that no explicit
+dependency to the used domain is given. The current value of the
+domain for the `LC_MESSAGES' locale is used. If this changes between
+two executions of the same `gettext' call in the program, both calls
+reference a different message catalog.
+
+ For the easiest case, which is normally used in internationalized
+packages, once at the beginning of execution a call to `textdomain' is
+issued, setting the domain to a unique name, normally the package name.
+In the following code all strings which have to be translated are
+filtered through the gettext function. That's all, the package speaks
+your language.
+
+
+File: gettext.info, Node: Ambiguities, Next: Locating Catalogs, Prev: Interface to gettext, Up: gettext
+
+Solving Ambiguities
+-------------------
+
+ While this single name domain work good for most applications there
+might be the need to get translations from more than one domain. Of
+course one could switch between different domains with calls to
+`textdomain', but this is really not convenient nor is it fast. A
+possible situation could be one case discussing while this writing: all
+error messages of functions in the set of common used functions should
+go into a separate domain `error'. By this mean we would only need to
+translate them once.
+
+For this reasons there are two more functions to retrieve strings:
+
+ char *dgettext (const char *domain_name, const char *msgid);
+ char *dcgettext (const char *domain_name, const char *msgid,
+ int category);
+
+ Both take an additional argument at the first place, which
+corresponds to the argument of `textdomain'. The third argument of
+`dcgettext' allows to use another locale but `LC_MESSAGES'. But I
+really don't know where this can be useful. If the DOMAIN_NAME is
+`NULL' or CATEGORY has an value beside the known ones, the result is
+undefined. It should also be noted that this function is not part of
+the second known implementation of this function family, the one found
+in Solaris.
+
+ A second ambiguity can arise by the fact, that perhaps more than one
+domain has the same name. This can be solved by specifying where the
+needed message catalog files can be found.
+
+ char *bindtextdomain (const char *domain_name,
+ const char *dir_name);
+
+ Calling this function binds the given domain to a file in the
+specified directory (how this file is determined follows below).
+Especially a file in the systems default place is not favored against
+the specified file anymore (as it would be by solely using
+`textdomain'). A `NULL' pointer for the DIR_NAME parameter returns the
+binding associated with DOMAIN_NAME. If DOMAIN_NAME itself is `NULL'
+nothing happens and a `NULL' pointer is returned. Here again as for
+all the other functions is true that none of the return value must be
+changed!
+
+ It is important to remember that relative path names for the
+DIR_NAME parameter can be trouble. Since the path is always computed
+relative to the current directory different results will be achieved
+when the program executes a `chdir' command. Relative paths should
+always be avoided to avoid dependencies and unreliabilities.
+
+
File: gettext.info, Node: Locating Catalogs, Next: Charset conversion, Prev: Ambiguities, Up: gettext
Locating Message Catalog Files
@@ -211,7 +347,7 @@ purpose.
An example for the us of this function is:
- printf (ngettext ("%d file removed", "%d files removed", n), n);
+ printf (ngettext ("%d file removed", "%d files removed", n), n);
Please note that the numeric value N has to be passed to the
`printf' function as well. It is not sufficient to pass it only to
@@ -246,10 +382,10 @@ details are explained in the GNU `gettext' manual. Here only a a bit
of information is provided.
The information about the plural form selection has to be stored in
-the header entry (the one with the empty `msgid' string). There should
-be something like:
+the header entry of the PO file (the one with the empty `msgid' string).
+The plural form information looks like this:
- nplurals=2; plural=n == 1 ? 0 : 1
+ Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;
The `nplurals' value must be a decimal number which specifies how
many different plural forms exist for this language. The string
@@ -272,7 +408,7 @@ Only one form:
distinction between the singular and plural form. An appropriate
header entry would look like this:
- nplurals=1; plural=0
+ Plural-Forms: nplurals=1; plural=0;
Languages with this property include:
@@ -289,7 +425,7 @@ Two forms, singular used for one only
This is the form used in most existing programs since it is what
English is using. A header entry would look like this:
- nplurals=2; plural=n != 1
+ Plural-Forms: nplurals=2; plural=n != 1;
(Note: this uses the feature of C expressions that boolean
expressions have to value zero or one.)
@@ -318,7 +454,7 @@ Two forms, singular used for zero and one
Exceptional case in the language family. The header entry would
be:
- nplurals=2; plural=n>1
+ Plural-Forms: nplurals=2; plural=n>1;
Languages with this property include:
@@ -328,7 +464,7 @@ Two forms, singular used for zero and one
Three forms, special cases for one and two
The header entry would be:
- nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2
+ Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;
Languages with this property include:
@@ -338,7 +474,8 @@ Three forms, special cases for one and two
Three forms, special case for one and all numbers ending in 2, 3, or 4
The header entry would look like this:
- nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 ? 1 : 2
+ Plural-Forms: nplurals=3; \
+ plural=n==1 ? 0 : n%10>=2 && n%10<=4 ? 1 : 2;
Languages with this property include:
@@ -348,8 +485,9 @@ Three forms, special case for one and all numbers ending in 2, 3, or 4
Three forms, special case for one and some numbers ending in 2, 3, or 4
The header entry would look like this:
- nplurals=3; plural=n==1 ? 0 : \
- n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2
+ Plural-Forms: nplurals=3; \
+ plural=n==1 ? 0 : \
+ n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
(Continuation in the next line is possible.)
@@ -361,7 +499,9 @@ Three forms, special case for one and some numbers ending in 2, 3, or 4
Four forms, special case for one and all numbers ending in 2, 3, or 4
The header entry would look like this:
- nplurals=4; plural=n==1 ? 0 : n%10==2 ? 1 : n%10==3 || n%10==4 ? 2 : 3
+ Plural-Forms: nplurals=4; \
+ plural=n==1 ? 0 : \
+ n%10==2 ? 1 : n%10==3 || n%10==4 ? 2 : 3;
Languages with this property include:
@@ -635,11 +775,11 @@ 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)'.
- One exception of the above is found on HP-UX systems. Here the C
-library does not contain the `alloca' function (and the HP compiler does
-not generate it inlined). But it is not intended to rewrite the whole
-library just because of this dumb system. Instead include the `alloca'
-function in all package you use the `libintl.a' in.
+ One exception of the above is found on HP-UX 10.01 systems. Here
+the C library does not contain the `alloca' function (and the HP
+compiler does not generate it inlined). But it is not intended to
+rewrite the whole library just because of this dumb system. Instead
+include the `alloca' function in all package you use the `libintl.a' in.

File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using libintl.a, Up: Programmers
@@ -1013,170 +1153,3 @@ concerns. Some of these doubts are presented and discussed, here.
the localization routines themselves.
-
-File: gettext.info, Node: Organization, Next: Information Flow, Prev: Discussions, Up: Translators
-
-Organization
-============
-
- On a larger scale, the true solution would be to organize some kind
-of fairly precise set up in which volunteers could participate. I gave
-some thought to this idea lately, and realize there will be some touchy
-points. I thought of writing to Richard Stallman to launch such a
-project, but feel it might be good to shake out the ideas between
-ourselves first. Most probably that Linux International has some
-experience in the field already, or would like to orchestrate the
-volunteer work, maybe. Food for thought, in any case!
-
- I guess we have to setup something early, somehow, that will help
-many possible contributors of the same language to interlock and avoid
-work duplication, and further be put in contact for solving together
-problems particular to their tongue (in most languages, there are many
-difficulties peculiar to translating technical English). My Swedish
-contributor acknowledged these difficulties, and I'm well aware of them
-for French.
-
- This is surely not a technical issue, but we should manage so the
-effort of locale contributors be maximally useful, despite the national
-team layer interface between contributors and maintainers.
-
- The Translation Project needs some setup for coordinating language
-coordinators. Localizing evolving programs will surely become a
-permanent and continuous activity in the free software community, once
-well started. The setup should be minimally completed and tested
-before GNU `gettext' becomes an official reality. The e-mail address
-`translation@iro.umontreal.ca' has been setup for receiving offers from
-volunteers and general e-mail on these topics. This address reaches
-the Translation Project coordinator.
-
-* Menu:
-
-* Central Coordination:: Central Coordination
-* National Teams:: National Teams
-* Mailing Lists:: Mailing Lists
-
-
-File: gettext.info, Node: Central Coordination, Next: National Teams, Prev: Organization, Up: Organization
-
-Central Coordination
---------------------
-
- I also think GNU will need sooner than it thinks, that someone setup
-a way to organize and coordinate these groups. Some kind of group of
-groups. My opinion is that it would be good that GNU delegates this
-task to a small group of collaborating volunteers, shortly. Perhaps in
-`gnu.announce' a list of this national committee's can be published.
-
- My role as coordinator would simply be to refer to Ulrich any German
-speaking volunteer interested to localization of free software
-packages, and maybe helping national groups to initially organize,
-while maintaining national registries for until national groups are
-ready to take over. In fact, the coordinator should ease volunteers to
-get in contact with one another for creating national teams, which
-should then select one coordinator per language, or country
-(regionalized language). If well done, the coordination should be
-useful without being an overwhelming task, the time to put delegations
-in place.
-
-
-File: gettext.info, Node: National Teams, Next: Mailing Lists, Prev: Central Coordination, Up: Organization
-
-National Teams
---------------
-
- I suggest we look for volunteer coordinators/editors for individual
-languages. These people will scan contributions of translation files
-for various programs, for their own languages, and will ensure high and
-uniform standards of diction.
-
- From my current experience with other people in these days, those who
-provide localizations are very enthusiastic about the process, and are
-more interested in the localization process than in the program they
-localize, and want to do many programs, not just one. This seems to
-confirm that having a coordinator/editor for each language is a good
-idea.
-
- We need to choose someone who is good at writing clear and concise
-prose in the language in question. That is hard--we can't check it
-ourselves. So we need to ask a few people to judge each others'
-writing and select the one who is best.
-
- I announce my prerelease to a few dozen people, and you would not
-believe all the discussions it generated already. I shudder to think
-what will happen when this will be launched, for true, officially,
-world wide. Who am I to arbitrate between two Czekolsovak users
-contradicting each other, for example?
-
- I assume that your German is not much better than my French so that
-I would not be able to judge about these formulations. What I would
-suggest is that for each language there is a group for people who
-maintain the PO files and judge about changes. I suspect there will be
-cultural differences between how such groups of people will behave.
-Some will have relaxed ways, reach consensus easily, and have anyone of
-the group relate to the maintainers, while others will fight to death,
-organize heavy administrations up to national standards, and use strict
-channels.
-
- The German team is putting out a good example. Right now, they are
-maybe half a dozen people revising translations of each other and
-discussing the linguistic issues. I do not even have all the names.
-Ulrich Drepper is taking care of coordinating the German team. He
-subscribed to all my pretest lists, so I do not even have to warn him
-specifically of incoming releases.
-
- I'm sure, that is a good idea to get teams for each language working
-on translations. That will make the translations better and more
-consistent.
-
-* Menu:
-
-* Sub-Cultures:: Sub-Cultures
-* Organizational Ideas:: Organizational Ideas
-
-
-File: gettext.info, Node: Sub-Cultures, Next: Organizational Ideas, Prev: National Teams, Up: National Teams
-
-Sub-Cultures
-............
-
- Taking French for example, there are a few sub-cultures around
-computers which developed diverging vocabularies. Picking volunteers
-here and there without addressing this problem in an organized way,
-soon in the project, might produce a distasteful mix of
-internationalized programs, and possibly trigger endless quarrels among
-those who really care.
-
- Keeping some kind of unity in the way French localization of
-internationalized programs is achieved is a difficult (and delicate)
-job. Knowing the latin character of French people (:-), if we take this
-the wrong way, we could end up nowhere, or spoil a lot of energies.
-Maybe we should begin to address this problem seriously _before_ GNU
-`gettext' become officially published. And I suspect that this means
-soon!
-
-
-File: gettext.info, Node: Organizational Ideas, Prev: Sub-Cultures, Up: National Teams
-
-Organizational Ideas
-....................
-
- I expect the next big changes after the official release. Please
-note that I use the German translation of the short GPL message. We
-need to set a few good examples before the localization goes out for
-true in the free software community. Here are a few points to discuss:
-
- * Each group should have one FTP server (at least one master).
-
- * The files on the server should reflect the latest version (of
- course!) and it should also contain a RCS directory with the
- corresponding archives (I don't have this now).
-
- * There should also be a ChangeLog file (this is more useful than the
- RCS archive but can be generated automatically from the later by
- Emacs).
-
- * A "core group" should judge about questionable changes (for now
- this group consists solely by me but I ask some others
- occasionally; this also seems to work).
-
-
diff --git a/doc/gettext.info-5 b/doc/gettext.info-5
index 03411a4..dcdf5eb 100644
--- a/doc/gettext.info-5
+++ b/doc/gettext.info-5
@@ -31,6 +31,173 @@ versions, except that this permission notice may be stated in a
translation approved by the Foundation.

+File: gettext.info, Node: Organization, Next: Information Flow, Prev: Discussions, Up: Translators
+
+Organization
+============
+
+ On a larger scale, the true solution would be to organize some kind
+of fairly precise set up in which volunteers could participate. I gave
+some thought to this idea lately, and realize there will be some touchy
+points. I thought of writing to Richard Stallman to launch such a
+project, but feel it might be good to shake out the ideas between
+ourselves first. Most probably that Linux International has some
+experience in the field already, or would like to orchestrate the
+volunteer work, maybe. Food for thought, in any case!
+
+ I guess we have to setup something early, somehow, that will help
+many possible contributors of the same language to interlock and avoid
+work duplication, and further be put in contact for solving together
+problems particular to their tongue (in most languages, there are many
+difficulties peculiar to translating technical English). My Swedish
+contributor acknowledged these difficulties, and I'm well aware of them
+for French.
+
+ This is surely not a technical issue, but we should manage so the
+effort of locale contributors be maximally useful, despite the national
+team layer interface between contributors and maintainers.
+
+ The Translation Project needs some setup for coordinating language
+coordinators. Localizing evolving programs will surely become a
+permanent and continuous activity in the free software community, once
+well started. The setup should be minimally completed and tested
+before GNU `gettext' becomes an official reality. The e-mail address
+`translation@iro.umontreal.ca' has been setup for receiving offers from
+volunteers and general e-mail on these topics. This address reaches
+the Translation Project coordinator.
+
+* Menu:
+
+* Central Coordination:: Central Coordination
+* National Teams:: National Teams
+* Mailing Lists:: Mailing Lists
+
+
+File: gettext.info, Node: Central Coordination, Next: National Teams, Prev: Organization, Up: Organization
+
+Central Coordination
+--------------------
+
+ I also think GNU will need sooner than it thinks, that someone setup
+a way to organize and coordinate these groups. Some kind of group of
+groups. My opinion is that it would be good that GNU delegates this
+task to a small group of collaborating volunteers, shortly. Perhaps in
+`gnu.announce' a list of this national committee's can be published.
+
+ My role as coordinator would simply be to refer to Ulrich any German
+speaking volunteer interested to localization of free software
+packages, and maybe helping national groups to initially organize,
+while maintaining national registries for until national groups are
+ready to take over. In fact, the coordinator should ease volunteers to
+get in contact with one another for creating national teams, which
+should then select one coordinator per language, or country
+(regionalized language). If well done, the coordination should be
+useful without being an overwhelming task, the time to put delegations
+in place.
+
+
+File: gettext.info, Node: National Teams, Next: Mailing Lists, Prev: Central Coordination, Up: Organization
+
+National Teams
+--------------
+
+ I suggest we look for volunteer coordinators/editors for individual
+languages. These people will scan contributions of translation files
+for various programs, for their own languages, and will ensure high and
+uniform standards of diction.
+
+ From my current experience with other people in these days, those who
+provide localizations are very enthusiastic about the process, and are
+more interested in the localization process than in the program they
+localize, and want to do many programs, not just one. This seems to
+confirm that having a coordinator/editor for each language is a good
+idea.
+
+ We need to choose someone who is good at writing clear and concise
+prose in the language in question. That is hard--we can't check it
+ourselves. So we need to ask a few people to judge each others'
+writing and select the one who is best.
+
+ I announce my prerelease to a few dozen people, and you would not
+believe all the discussions it generated already. I shudder to think
+what will happen when this will be launched, for true, officially,
+world wide. Who am I to arbitrate between two Czekolsovak users
+contradicting each other, for example?
+
+ I assume that your German is not much better than my French so that
+I would not be able to judge about these formulations. What I would
+suggest is that for each language there is a group for people who
+maintain the PO files and judge about changes. I suspect there will be
+cultural differences between how such groups of people will behave.
+Some will have relaxed ways, reach consensus easily, and have anyone of
+the group relate to the maintainers, while others will fight to death,
+organize heavy administrations up to national standards, and use strict
+channels.
+
+ The German team is putting out a good example. Right now, they are
+maybe half a dozen people revising translations of each other and
+discussing the linguistic issues. I do not even have all the names.
+Ulrich Drepper is taking care of coordinating the German team. He
+subscribed to all my pretest lists, so I do not even have to warn him
+specifically of incoming releases.
+
+ I'm sure, that is a good idea to get teams for each language working
+on translations. That will make the translations better and more
+consistent.
+
+* Menu:
+
+* Sub-Cultures:: Sub-Cultures
+* Organizational Ideas:: Organizational Ideas
+
+
+File: gettext.info, Node: Sub-Cultures, Next: Organizational Ideas, Prev: National Teams, Up: National Teams
+
+Sub-Cultures
+............
+
+ Taking French for example, there are a few sub-cultures around
+computers which developed diverging vocabularies. Picking volunteers
+here and there without addressing this problem in an organized way,
+soon in the project, might produce a distasteful mix of
+internationalized programs, and possibly trigger endless quarrels among
+those who really care.
+
+ Keeping some kind of unity in the way French localization of
+internationalized programs is achieved is a difficult (and delicate)
+job. Knowing the latin character of French people (:-), if we take this
+the wrong way, we could end up nowhere, or spoil a lot of energies.
+Maybe we should begin to address this problem seriously _before_ GNU
+`gettext' become officially published. And I suspect that this means
+soon!
+
+
+File: gettext.info, Node: Organizational Ideas, Prev: Sub-Cultures, Up: National Teams
+
+Organizational Ideas
+....................
+
+ I expect the next big changes after the official release. Please
+note that I use the German translation of the short GPL message. We
+need to set a few good examples before the localization goes out for
+true in the free software community. Here are a few points to discuss:
+
+ * Each group should have one FTP server (at least one master).
+
+ * The files on the server should reflect the latest version (of
+ course!) and it should also contain a RCS directory with the
+ corresponding archives (I don't have this now).
+
+ * There should also be a ChangeLog file (this is more useful than the
+ RCS archive but can be generated automatically from the later by
+ Emacs).
+
+ * A "core group" should judge about questionable changes (for now
+ this group consists solely by me but I ask some others
+ occasionally; this also seems to work).
+
+
+
File: gettext.info, Node: Mailing Lists, Prev: National Teams, Up: Organization
Mailing Lists
@@ -164,23 +331,19 @@ functions meant to replace or complement C libraries, and a
subdirectory `src/' for holding the proper sources for the package.
These other distributions are said to be "non-flat".
- For now, we cannot say much about flat distributions. A flat
-directory structure has the disadvantage of increasing the difficulty
-of updating to a new version of GNU `gettext'. Also, if you have many
-PO files, this could somewhat pollute your single directory. In the
-GNU `gettext' distribution, the `misc/' directory contains a shell
-script named `combine-sh'. That script may be used for combining all
-the C files of the `intl/' directory into a pair of C files (one `.c'
-and one `.h'). Those two generated files would fit more easily in a
-flat directory structure, and you will then have to add these two files
-to your project.
+ We cannot say much about flat distributions. A flat directory
+structure has the disadvantage of increasing the difficulty of updating
+to a new version of GNU `gettext'. Also, if you have many PO files,
+this could somewhat pollute your single directory. Also, GNU
+`gettext''s libintl sources consist of C sources, shell scripts, `sed'
+scripts and complicated Makefile rules, which don't fit well into an
+existing flat structure. For these reasons, we recommend to use
+non-flat approach in this case as well.
Maybe because GNU `gettext' itself has a non-flat structure, we have
more experience with this approach, and this is what will be described
in the remaining of this chapter. Some maintainers might use this as
-an opportunity to unflatten their package structure. Only later, once
-gained more experience adapting GNU `gettext' to flat distributions, we
-might add some notes about how to proceed in flat situations.
+an opportunity to unflatten their package structure.

File: gettext.info, Node: Prerequisites, Next: gettextize Invocation, Prev: Flat and Non-Flat, Up: Maintainers
diff --git a/doc/version.texi b/doc/version.texi
index 757ecb3..bda6d12 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 11 March 2001
+@set UPDATED 29 March 2001
@set EDITION 0.10.36
@set VERSION 0.10.36
diff --git a/intl/plural.c b/intl/plural.c
index d1fd1cb..8191335 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -11,7 +11,11 @@
#define yychar __gettextchar
#define yydebug __gettextdebug
#define yynerrs __gettextnerrs
-#define NUMBER 257
+#define EQUOP2 257
+#define CMPOP2 258
+#define ADDOP2 259
+#define MULOP2 260
+#define NUMBER 261
#line 1 "plural.y"
@@ -33,6 +37,14 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/* The bison generated parser uses alloca. AIX 3 forces us to put this
+ declaration at the beginning of the file. The declaration in bison's
+ skeleton file comes too late. This must come before <config.h>
+ because <config.h> may include arbitrary system headers. */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -54,24 +66,110 @@
#define YYLEX_PARAM &((struct parse_args *) arg)->cp
#define YYPARSE_PARAM arg
-#line 44 "plural.y"
+#line 52 "plural.y"
typedef union {
unsigned long int num;
+ enum operator op;
struct expression *exp;
} YYSTYPE;
-#line 49 "plural.y"
+#line 58 "plural.y"
/* Prototypes for local functions. */
-static struct expression *new_exp_0 PARAMS ((enum operator op));
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+ struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+ struct expression *right));
static struct expression *new_exp_2 PARAMS ((enum operator op,
struct expression *left,
struct expression *right));
-static struct expression *new_exp_3 PARAMS ((enum operator op,
- struct expression *bexp,
- struct expression *tbranch,
- struct expression *fbranch));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+ struct expression *bexp,
+ struct expression *tbranch,
+ struct expression *fbranch));
static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions. */
+
+static struct expression *
+new_exp (nargs, op, args)
+ int nargs;
+ enum operator op;
+ struct expression * const *args;
+{
+ int i;
+ struct expression *newp;
+
+ /* If any of the argument could not be malloc'ed, just return NULL. */
+ for (i = nargs - 1; i >= 0; i--)
+ if (args[i] == NULL)
+ goto fail;
+
+ /* Allocate a new expression. */
+ newp = (struct expression *) malloc (sizeof (*newp));
+ if (newp != NULL)
+ {
+ newp->nargs = nargs;
+ newp->operation = op;
+ for (i = nargs - 1; i >= 0; i--)
+ newp->val.args[i] = args[i];
+ return newp;
+ }
+
+ fail:
+ for (i = nargs - 1; i >= 0; i--)
+ FREE_EXPRESSION (args[i]);
+
+ return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+ enum operator op;
+{
+ return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+ enum operator op;
+ struct expression *right;
+{
+ struct expression *args[1];
+
+ args[0] = right;
+ return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+ enum operator op;
+ struct expression *left;
+ struct expression *right;
+{
+ struct expression *args[2];
+
+ args[0] = left;
+ args[1] = right;
+ return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+ enum operator op;
+ struct expression *bexp;
+ struct expression *tbranch;
+ struct expression *fbranch;
+{
+ struct expression *args[3];
+
+ args[0] = bexp;
+ args[1] = tbranch;
+ args[2] = fbranch;
+ return new_exp (3, op, args);
+}
+
#include <stdio.h>
#ifndef __cplusplus
@@ -82,24 +180,24 @@ static void yyerror PARAMS ((const char *str));
-#define YYFINAL 31
+#define YYFINAL 27
#define YYFLAG -32768
-#define YYNTBASE 18
+#define YYNTBASE 16
-#define YYTRANSLATE(x) ((unsigned)(x) <= 257 ? yytranslate[x] : 20)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 7, 2, 2, 2, 12, 5, 2, 16,
- 17, 10, 8, 2, 9, 2, 11, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 14, 2, 2,
- 6, 2, 3, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 10, 2, 2, 2, 2, 5, 2, 14,
+ 15, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 12, 2, 2,
+ 2, 2, 3, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 15,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 13,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 4, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -114,30 +212,30 @@ static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 13
+ 2, 2, 2, 2, 2, 1, 6, 7, 8, 9,
+ 11
};
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
- 0, 2, 8, 12, 16, 20, 24, 28, 32, 36,
- 40, 44, 46, 48
+ 0, 2, 8, 12, 16, 20, 24, 28, 32, 35,
+ 37, 39
};
-static const short yyrhs[] = { 19,
- 0, 19, 3, 19, 14, 19, 0, 19, 4, 19,
- 0, 19, 5, 19, 0, 19, 6, 19, 0, 19,
- 7, 19, 0, 19, 8, 19, 0, 19, 9, 19,
- 0, 19, 10, 19, 0, 19, 11, 19, 0, 19,
- 12, 19, 0, 15, 0, 13, 0, 16, 19, 17,
- 0
+static const short yyrhs[] = { 17,
+ 0, 17, 3, 17, 12, 17, 0, 17, 4, 17,
+ 0, 17, 5, 17, 0, 17, 6, 17, 0, 17,
+ 7, 17, 0, 17, 8, 17, 0, 17, 9, 17,
+ 0, 10, 17, 0, 13, 0, 11, 0, 14, 17,
+ 15, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 74, 80, 85, 90, 95, 100, 105, 110, 115, 120,
- 125, 130, 135, 141
+ 177, 185, 189, 193, 197, 201, 205, 209, 213, 217,
+ 221, 226
};
#endif
@@ -145,67 +243,61 @@ static const short yyrline[] = { 0,
#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'",
-"'&'","'='","'!'","'+'","'-'","'*'","'/'","'%'","NUMBER","':'","'n'","'('","')'",
+"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
"start","exp", NULL
};
#endif
static const short yyr1[] = { 0,
- 18, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19
+ 16, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17
};
static const short yyr2[] = { 0,
- 1, 5, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 1, 1, 3
+ 1, 5, 3, 3, 3, 3, 3, 3, 2, 1,
+ 1, 3
};
static const short yydefact[] = { 0,
- 13, 12, 0, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 14, 0, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 0, 2, 0, 0,
- 0
+ 0, 11, 10, 0, 1, 9, 0, 0, 0, 0,
+ 0, 0, 0, 0, 12, 0, 3, 4, 5, 6,
+ 7, 8, 0, 2, 0, 0, 0
};
-static const short yydefgoto[] = { 29,
- 4
+static const short yydefgoto[] = { 25,
+ 5
};
-static const short yypact[] = { 58,
--32768,-32768, 58, 37, 10, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58,-32768, 25, 45, 52, 57,
- 57, 65, 65,-32768,-32768,-32768, 58, 37, 1, 2,
--32768
+static const short yypact[] = { -9,
+ -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9,
+ -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26,
+ -3,-32768, -9, 34, 21, 53,-32768
};
static const short yypgoto[] = {-32768,
- -3
+ -1
};
-#define YYLAST 77
+#define YYLAST 53
-static const short yytable[] = { 5,
- 30, 31, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 0, 28, 0, 0, 16, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 0, 27, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 8,
- 9, 10, 11, 12, 13, 14, 15, 9, 10, 11,
- 12, 13, 14, 15, 11, 12, 13, 14, 15, 0,
- 1, 0, 2, 3, 13, 14, 15
+static const short yytable[] = { 6,
+ 1, 2, 7, 3, 4, 14, 16, 17, 18, 19,
+ 20, 21, 22, 8, 9, 10, 11, 12, 13, 14,
+ 26, 24, 12, 13, 14, 15, 8, 9, 10, 11,
+ 12, 13, 14, 13, 14, 23, 8, 9, 10, 11,
+ 12, 13, 14, 10, 11, 12, 13, 14, 11, 12,
+ 13, 14, 27
};
-static const short yycheck[] = { 3,
- 0, 0, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, -1, 27, -1, -1, 17, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, -1, 14, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 5,
- 6, 7, 8, 9, 10, 11, 12, 6, 7, 8,
- 9, 10, 11, 12, 8, 9, 10, 11, 12, -1,
- 13, -1, 15, 16, 10, 11, 12
+static const short yycheck[] = { 1,
+ 10, 11, 4, 13, 14, 9, 8, 9, 10, 11,
+ 12, 13, 14, 3, 4, 5, 6, 7, 8, 9,
+ 0, 23, 7, 8, 9, 15, 3, 4, 5, 6,
+ 7, 8, 9, 8, 9, 12, 3, 4, 5, 6,
+ 7, 8, 9, 5, 6, 7, 8, 9, 6, 7,
+ 8, 9, 0
};
#define YYPURE 1
@@ -753,100 +845,78 @@ yyreduce:
switch (yyn) {
case 1:
-#line 75 "plural.y"
+#line 178 "plural.y"
{
+ if (yyvsp[0].exp == NULL)
+ YYABORT;
((struct parse_args *) arg)->res = yyvsp[0].exp;
;
break;}
case 2:
-#line 81 "plural.y"
+#line 186 "plural.y"
{
- if ((yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 3:
-#line 86 "plural.y"
+#line 190 "plural.y"
{
- if ((yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 4:
-#line 91 "plural.y"
+#line 194 "plural.y"
{
- if ((yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 5:
-#line 96 "plural.y"
+#line 198 "plural.y"
{
- if ((yyval.exp = new_exp_2 (equal, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 6:
-#line 101 "plural.y"
+#line 202 "plural.y"
{
- if ((yyval.exp = new_exp_2 (not_equal, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 7:
-#line 106 "plural.y"
+#line 206 "plural.y"
{
- if ((yyval.exp = new_exp_2 (plus, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 8:
-#line 111 "plural.y"
+#line 210 "plural.y"
{
- if ((yyval.exp = new_exp_2 (minus, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
;
break;}
case 9:
-#line 116 "plural.y"
+#line 214 "plural.y"
{
- if ((yyval.exp = new_exp_2 (mult, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
;
break;}
case 10:
-#line 121 "plural.y"
+#line 218 "plural.y"
{
- if ((yyval.exp = new_exp_2 (divide, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ yyval.exp = new_exp_0 (var);
;
break;}
case 11:
-#line 126 "plural.y"
+#line 222 "plural.y"
{
- if ((yyval.exp = new_exp_2 (module, yyvsp[-2].exp, yyvsp[0].exp)) == NULL)
- YYABORT
+ if ((yyval.exp = new_exp_0 (num)) != NULL)
+ yyval.exp->val.num = yyvsp[0].num;
;
break;}
case 12:
-#line 131 "plural.y"
-{
- if ((yyval.exp = new_exp_0 (var)) == NULL)
- YYABORT
- ;
- break;}
-case 13:
-#line 136 "plural.y"
-{
- if ((yyval.exp = new_exp_0 (num)) == NULL)
- YYABORT;
- yyval.exp->val.num = yyvsp[0].num
- ;
- break;}
-case 14:
-#line 142 "plural.y"
+#line 227 "plural.y"
{
- yyval.exp = yyvsp[-1].exp
+ yyval.exp = yyvsp[-1].exp;
;
break;}
}
@@ -1071,75 +1141,8 @@ yyerrhandle:
}
return 1;
}
-#line 147 "plural.y"
-
-
-static struct expression *
-new_exp_0 (op)
- enum operator op;
-{
- struct expression *newp = (struct expression *) malloc (sizeof (*newp));
-
- if (newp != NULL)
- newp->operation = op;
-
- return newp;
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
- enum operator op;
- struct expression *left;
- struct expression *right;
-{
- struct expression *newp = NULL;
+#line 232 "plural.y"
- if (left != NULL && right != NULL)
- newp = (struct expression *) malloc (sizeof (*newp));
-
- if (newp != NULL)
- {
- newp->operation = op;
- newp->val.args2.left = left;
- newp->val.args2.right = right;
- }
- else
- {
- FREE_EXPRESSION (left);
- FREE_EXPRESSION (right);
- }
-
- return newp;
-}
-
-static struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
- enum operator op;
- struct expression *bexp;
- struct expression *tbranch;
- struct expression *fbranch;
-{
- struct expression *newp = NULL;
-
- if (bexp != NULL && tbranch != NULL && fbranch != NULL)
- newp = (struct expression *) malloc (sizeof (*newp));
-
- if (newp != NULL)
- {
- newp->operation = op;
- newp->val.args3.bexp = bexp;
- newp->val.args3.tbranch = tbranch;
- newp->val.args3.fbranch = fbranch;
- }
- else
- {
- FREE_EXPRESSION (bexp);
- FREE_EXPRESSION (tbranch);
- FREE_EXPRESSION (fbranch);
- }
-
- return newp;
-}
void
internal_function
@@ -1150,25 +1153,17 @@ FREE_EXPRESSION (exp)
return;
/* Handle the recursive case. */
- switch (exp->operation)
+ switch (exp->nargs)
{
- case qmop:
- FREE_EXPRESSION (exp->val.args3.fbranch);
+ case 3:
+ FREE_EXPRESSION (exp->val.args[2]);
+ /* FALLTHROUGH */
+ case 2:
+ FREE_EXPRESSION (exp->val.args[1]);
+ /* FALLTHROUGH */
+ case 1:
+ FREE_EXPRESSION (exp->val.args[0]);
/* FALLTHROUGH */
-
- case mult:
- case divide:
- case module:
- case plus:
- case minus:
- case equal:
- case not_equal:
- case land:
- case lor:
- FREE_EXPRESSION (exp->val.args2.right);
- FREE_EXPRESSION (exp->val.args2.left);
- break;
-
default:
break;
}
@@ -1187,12 +1182,6 @@ yylex (lval, pexp)
while (1)
{
- if (exp[0] == '\\' && exp[1] == '\n')
- {
- exp += 2;
- continue;
- }
-
if (exp[0] == '\0')
{
*pexp = exp;
@@ -1224,13 +1213,25 @@ yylex (lval, pexp)
break;
case '=':
- case '!':
if (exp[0] == '=')
- ++exp;
+ {
+ ++exp;
+ lval->op = equal;
+ result = EQUOP2;
+ }
else
result = YYERRCODE;
break;
+ case '!':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = not_equal;
+ result = EQUOP2;
+ }
+ break;
+
case '&':
case '|':
if (exp[0] == result)
@@ -1239,12 +1240,54 @@ yylex (lval, pexp)
result = YYERRCODE;
break;
- case 'n':
+ case '<':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = less_or_equal;
+ }
+ else
+ lval->op = less_than;
+ result = CMPOP2;
+ break;
+
+ case '>':
+ if (exp[0] == '=')
+ {
+ ++exp;
+ lval->op = greater_or_equal;
+ }
+ else
+ lval->op = greater_than;
+ result = CMPOP2;
+ break;
+
case '*':
+ lval->op = mult;
+ result = MULOP2;
+ break;
+
case '/':
+ lval->op = divide;
+ result = MULOP2;
+ break;
+
case '%':
+ lval->op = module;
+ result = MULOP2;
+ break;
+
case '+':
+ lval->op = plus;
+ result = ADDOP2;
+ break;
+
case '-':
+ lval->op = minus;
+ result = ADDOP2;
+ break;
+
+ case 'n':
case '?':
case ':':
case '(':
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3ce86ba..69aa74a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -141,7 +141,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
HEADERS = $(noinst_HEADERS)
DIST_COMMON = ChangeLog Makefile.am Makefile.in alloca.c error.c \
-error.h getline.c memmove.c memset.c printf-prs.c stpcpy.c stpncpy.c \
+error.h memmove.c memset.c printf-prs.c stpcpy.c stpncpy.c strcasecmp.c \
strcspn.c strncasecmp.c strstr.c strtoul.c vasprintf.c
diff --git a/m4/Makefile.in b/m4/Makefile.in
index edd6af9..f6a7a58 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -99,7 +99,7 @@ aclocal_DATA = codeset.m4 gettext.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest
# Generate this list with
# find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
# |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
-EXTRA_DIST = README c-bs-a.m4 codeset.m4 gettext.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = README c-bs-a.m4 codeset.m4 getline.m4 gettext.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 libtool.m4 progtest.m4 setlocale.m4 signed.m4 uintmax_t.m4 ulonglong.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 42f6599..4ed3298 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -71,6 +71,7 @@ EMACS = @EMACS@
EXEEXT = @EXEEXT@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+INTLBISON = @INTLBISON@
INTLLIBS = @INTLLIBS@
INTLOBJS = @INTLOBJS@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
@@ -96,8 +97,7 @@ lispdir = @lispdir@
AUTOMAKE_OPTIONS = 1.2 gnits
-EXTRA_DIST = combine-sh gettext.perl gettext-sh tcl_gettext.c README-Tcl po-mode.el
-
+EXTRA_DIST = gettext.perl gettext-sh tcl_gettext.c README-Tcl po-mode.el
DISTCLEANFILES = gettextize
lisp_LISP = po-mode.el
diff --git a/po/da.gmo b/po/da.gmo
index e88844f..6231443 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/da.po b/po/da.po
index f6f732b..b9b1160 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1997-08-29 07:21 MDT\n"
"Last-Translator: Thorbjoern Ravn Andersen <ravn@mip.ou.dk>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -81,8 +81,8 @@ msgstr "%s: tilvalget '--%s' tager ikke et argument\n"
msgid "memory exhausted"
msgstr "ikke mere ledig hukommelse"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -94,8 +94,8 @@ msgstr ""
"INGEN garanti -- end ikke for SALGBARHED eller VELEGNETHED TIL NOGET SÆRLIGT\n"
"FORMÅL.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet af %s.\n"
@@ -108,8 +108,8 @@ msgstr "for mange argumenter"
msgid "missing arguments"
msgstr "argumenter mangler"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Information fås med `%s --help'\n"
@@ -162,8 +162,8 @@ msgstr ""
"oversættes de tekster der findes i det valgte tekstkatalog.\n"
"Standard filkataloget for søgning er: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Rapportér fejl på engelsk til <bug-gnu-utils@gnu.org>.\n"
@@ -229,11 +229,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "fandt %d fatale fejl"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "tekst erklæret mere end en gang"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "... her er den første erklæring"
@@ -244,25 +244,25 @@ msgstr "denne besked har ingen erklæring i '%s' domænet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "under udskriftsforberedelse"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s udelukker hinanden"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -293,7 +293,7 @@ msgstr ""
" --foreign-user undlad FSF copyright i udskrift til fremmed bruger\n"
" -F, --sort-by-file sortér uddata efter filposition\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -327,7 +327,7 @@ msgstr ""
"\n"
"Hvis INPUTFIL er -, læses fra standard inddata.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -347,17 +347,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fejl ved læse-åbning af '%s'"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "denne fil må ikke indeholde 'domain' kommandoer"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "ingen inddatafil angivet"
@@ -782,7 +782,7 @@ msgid ""
msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -797,20 +797,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -852,22 +852,22 @@ msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: streng'literal' ikke afsluttet"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -905,15 +905,14 @@ msgstr ""
" --foreign-user undlad FSF copyright i udskrift til fremmed bruger\n"
" -F, --sort-by-file sortér uddata efter filposition\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -932,7 +931,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRENG] brug STRENG/'' som suffiks for `msgstr' tekster\n"
" --no-location undlad skrivning af '#: filnavn:linie' linier\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -961,17 +960,17 @@ msgstr ""
"\n"
"Hvis INPUTFIL er -, læses fra standard inddata.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: advarsel: streng'literal' ikke afsluttet"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "ukendt sprog `%s'"
diff --git a/po/de.gmo b/po/de.gmo
index 7d371cd..63672b9 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/el.gmo b/po/el.gmo
index 9ef88d9..f42ed29 100644
--- a/po/el.gmo
+++ b/po/el.gmo
Binary files differ
diff --git a/po/el.po b/po/el.po
index b8c77ab..2c2eb79 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: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1998-05-17 13:12+0200\n"
"Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
"Language-Team: Greek <simos@teiath.gr>\n"
@@ -96,8 +96,8 @@ msgid "memory exhausted"
msgstr "H ìíŞìç åîáíôëŞèçêå"
#
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -110,8 +110,8 @@ msgstr ""
"ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Ş ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏĞÏ.\n"
#
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Ãñáììİíï áğü ôïí/ôçí %s.\n"
@@ -127,8 +127,8 @@ msgid "missing arguments"
msgstr "õğïëåßğïíôáé ïñßóìáôá"
#
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ğåñéóóüôåñåò ğëçñïöïñßåò.\n"
@@ -182,8 +182,8 @@ msgstr ""
"Êáèéåñùìİíïò êáôÜëïãïò áíáæŞôçóçò: %s\n"
#
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Óôåßëôå áíáöïñİò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
@@ -259,12 +259,12 @@ msgid_plural "found %d fatal errors"
msgstr[0] "âñİèçêáí %d óïâáñÜ óöÜëìáôá"
#
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "åğáíáëáìâáíüìåíïò ïñéóìüò ìçíıìáôïò"
#
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...áõôŞ åßíáé ç èİóç ôïõ ğñşôïõ ïñéóìïı"
@@ -277,29 +277,29 @@ msgstr "áõôü ôï ìŞíõìá äåí İ÷åé ïñéóìü óôç ğåñéï÷Ş \"%s\""
#
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "êáèşò ğñïåôïéìáæüôáí ç İîïäïò"
#
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "ôá %s êáé %s åßíáé áìïéâáßá áğïêëåéşìåíá"
#
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "ğñİğåé íá ïñéóôïıí ôïõëÜ÷éóôïí äıï áñ÷åßá"
#
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "İ÷åé åğéëå÷èåß áäıíáôï êñéôŞñéï åğéëïãŞò (%d < n < %d)"
#
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -328,7 +328,7 @@ msgstr ""
" -h, --help åìöÜíéóç áõôŞò ôçò âïŞèåéáò êáé İîïäïò\n"
#
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -367,7 +367,7 @@ msgstr ""
" åìöÜíéóç ìüíï ôùí ìïíáäéêşí ìçíõìÜôùí\n"
#
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -407,19 +407,19 @@ msgstr ""
"èá äéáôçñçèïıí.\n"
#
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
#
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "áõôü ôï áñ÷åßï äåí ìğïñåß íá ğåñéİ÷åé ïäçãßåò ãéá ôç ğåñéï÷Ş"
#
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
@@ -911,7 +911,7 @@ msgstr ""
"%s: ğñïåéäïğïßçóç: ôï áñ÷åßï åéóüäïõ ğåñéİ÷åé ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -927,24 +927,24 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
"%s: ğñïåéäïğïßçóç: ôï áñ÷åßï åéóüäïõ ğåñéİ÷åé ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
"%s: ğñïåéäïğïßçóç: ôï áñ÷åßï åéóüäïõ ğåñéİ÷åé ğñïóåããéóôéêİò ìåôáöñÜóåéò"
#
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -997,25 +997,25 @@ msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ğñïåéäïğïßçóç: ìç ôåñìáôéóìİíï áëöáñéèìçôéêü"
#
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"ôï --join-existing äå ìğïñåß íá ÷ñçóéìïğïéçèåß üôáí ç İîïäïò ãñÜöåôáé óôçí "
"êáíïíéêŞ İîïäï"
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
#
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"ğñïåéäïğïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
#
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1059,15 +1059,14 @@ msgstr ""
" -F, --sort-by-file ôáîéíüìçóç åîüäïõ âÜóç ôçò èİóçò áñ÷åßïõ\n"
#
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -1087,7 +1086,7 @@ msgstr ""
" --no-location íá ìçí ãñáöïıí ãñáììİò '#: filename:line'\n"
#
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -1119,18 +1118,18 @@ msgstr ""
"Áí ôï ÁÑ×ÅÉÏÅÉÓÏÄÏÕ åßíáé -, ãßíåôáé áíÜãíùóç ôçò êáíïíéêŞò åéóüäïõ.\n"
#
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: ğñïåéäïğïßçóç: ìç ôåñìáôéóìİíï áëöáñéèìçôéêü"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
#
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "ç ãëşóóá `%s' åßíáé Üãíùóôç"
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index e418111..46ac633 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
Binary files differ
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index e0de2cd..e950f6e 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
Binary files differ
diff --git a/po/es.gmo b/po/es.gmo
index 7a48afa..827e0a5 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index c4c8a0d..a675101 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1998-04-29 12:04-0500\n"
"Last-Translator: Max de Mendizábal <max@tirania.nuclecu.unam.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -86,8 +86,8 @@ msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
msgid "memory exhausted"
msgstr "Memoria agotada"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -99,8 +99,8 @@ msgstr ""
"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
@@ -113,8 +113,8 @@ msgstr "demasiados argumentos"
msgid "missing arguments"
msgstr "faltan argumentos"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para más información.\n"
@@ -182,8 +182,8 @@ msgstr ""
"encuentre dentro del catálogo seleccionado.\n"
"Directorio de búsqueda estándar: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
@@ -333,11 +333,11 @@ msgid_plural "found %d fatal errors"
msgstr[0] "se encontraron %d errores fatales"
# Nota: es la definición la que está duplicada.
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "definición del mensaje duplicada"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...aquí está la primera definición"
@@ -348,20 +348,20 @@ msgstr "este mensaje no tiene definición en el dominio \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "mientras se preparaba la salida"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s y %s son mutuamente excluyentes"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "se deben especificar por lo menos dos ficheros"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
@@ -371,7 +371,7 @@ msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
# opción de debug hace algo más que simplemente dar más información y es
# necesario aclarar el punto.
# 27061996sv: Me refería a lo de las 80 columnas...
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -411,7 +411,7 @@ msgstr ""
# hay cosa más incómoda que hacer un `algo --help' y que precisamente lo que
# nos interese se haya salido de la/el terminal em+
# Ok. mm+
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -447,7 +447,7 @@ msgstr ""
" -u, --unique abreviatura de --less-than=2, solicita\n"
" que sólo los mensajes únicos sean mostrados\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -485,8 +485,8 @@ msgstr ""
"dentro\n"
"del fichero de todos los ficheros PO se conservarán.\n"
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error al abrir el fichero \"%s\" para lectura"
@@ -522,12 +522,12 @@ msgstr "error al abrir el fichero \"%s\" para lectura"
# 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/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "este fichero no puede contener instrucciones de dominio"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "no se especificó el fichero de entrada"
@@ -1134,7 +1134,7 @@ msgid ""
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -1149,20 +1149,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -1206,17 +1206,17 @@ msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: atención: literal de cadena no finalizada"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
@@ -1228,7 +1228,7 @@ msgstr ""
# opción de debug hace algo más que simplemente dar más información y es
# necesario aclarar el punto.
# 27061996sv: Me refería a lo de las 80 columnas...
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -1278,15 +1278,14 @@ msgstr ""
" no ingleses\n"
" -F, --sort-by-file ordena la salida por ubicación del fichero\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -1320,7 +1319,7 @@ msgstr ""
# hay cosa más incómoda que hacer un `algo --help' y que precisamente lo que
# nos interese se haya salido de la/el terminal em+
# Ok. mm+
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -1351,17 +1350,17 @@ msgstr ""
"\n"
"Si el FICHERO_DE_ENTRADA es -, se lee de la entrada estándar.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: atención: literal de cadena no finalizada"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "lenguaje `%s' desconocido"
diff --git a/po/fr.gmo b/po/fr.gmo
index 3fa8912..8dd93f5 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index 0a594f9..515b7b2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1998-05-04 10:03-04:00\n"
"Last-Translator: François Pinard <pinard@iro.umontreal.ca>\n"
"Language-Team: French <fr@li.org>\n"
@@ -82,8 +82,8 @@ msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
msgid "memory exhausted"
msgstr "Mémoire entièrement consommée"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -95,8 +95,8 @@ 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:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Écrit par %s.\n"
@@ -109,8 +109,8 @@ msgstr "trop d'arguments"
msgid "missing arguments"
msgstr "arguments manquants"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour plus d'information, essayer « %s --help ».\n"
@@ -161,8 +161,8 @@ msgstr ""
"\n"
"Ensemble des répertoires fouillés: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"Rapportez tout problème fonctionnel à <bug-gnu-utils@gnu.org>.\n"
@@ -230,11 +230,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d erreurs terminales"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "message doublement défini"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...voici l'endroit de la première définition"
@@ -245,25 +245,25 @@ msgstr "ce message n'a pas de définition dans le domaine « %s »"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "lors de la préparation de la sortie"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s et %s s'excluent mutuellement"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "Il faut indiquer au moins deux fichiers"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "Critère de sélection irréalisable (%d < N < %d)"
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -290,7 +290,7 @@ msgstr ""
" -F, --sort-by-file trier selon la position dans chaque fichier\n"
" -h, --help fournir ce message d'aide, puis terminer\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -325,7 +325,7 @@ msgstr ""
"entrée\n"
" -u, --unique même chose que « -< 2 »\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -359,17 +359,17 @@ msgstr ""
"proviennent du premier fichier PO à les définir, les références sont\n"
"accumulées de tous les fichiers PO qui en fournissent.\n"
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erreur lors de l'ouverture de « %s » en lecture"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "ce fichier ne peut contenir des directives de domaine"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "aucun fichier d'entrée fourni"
@@ -805,7 +805,7 @@ msgid ""
msgstr "%s: attention: certaines traductions sont approximatives"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -820,20 +820,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: attention: certaines traductions sont approximatives"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: attention: certaines traductions sont approximatives"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -876,21 +876,21 @@ msgstr "%s:%d: attention: constante caractère sans terminateur"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: attention: constante chaîne sans terminateur"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing interdit si production sur sortie standard"
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -931,15 +931,14 @@ msgstr ""
" --foreign-user inhiber la production d'un copyright FSF\n"
" -F, --sort-by-file trier selon la position dans chaque fichier\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -957,7 +956,7 @@ msgstr ""
" -M, --msgstr-suffix[=CHAÎNE] suffixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n"
" --no-location ne pas produire les « #: FICHIER:LIGNE »\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -986,17 +985,17 @@ msgstr ""
"\n"
"Si le FICHIER est « - », lit l'entrée standard.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: attention: constante chaîne sans terminateur"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "langage « %s » inconnu"
diff --git a/po/gettext.pot b/po/gettext.pot
index e12da7f..288410e 100644
--- a/po/gettext.pot
+++ b/po/gettext.pot
@@ -6,13 +6,13 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8-bit\n"
#: lib/error.c:115
msgid "Unknown system error"
@@ -81,8 +81,8 @@ msgstr ""
msgid "memory exhausted"
msgstr ""
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -90,8 +90,8 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr ""
@@ -104,8 +104,8 @@ msgstr ""
msgid "missing arguments"
msgstr ""
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
@@ -138,8 +138,8 @@ msgid ""
"Standard search directory: %s\n"
msgstr ""
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
@@ -192,11 +192,11 @@ msgid_plural "found %d fatal errors"
msgstr[0] ""
msgstr[1] ""
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr ""
@@ -207,25 +207,25 @@ msgstr ""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr ""
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr ""
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -240,7 +240,7 @@ msgid ""
" -h, --help display this help and exit\n"
msgstr ""
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -259,7 +259,7 @@ msgid ""
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -279,17 +279,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr ""
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr ""
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr ""
@@ -627,7 +627,7 @@ msgid ""
msgstr ""
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -642,20 +642,20 @@ msgstr ""
#, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
-#: src/po.c:330
+#: src/po.c:334
#, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -697,20 +697,20 @@ msgstr ""
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -732,15 +732,14 @@ msgid ""
" -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -748,7 +747,7 @@ msgid ""
" --no-location do not write '#: filename:line' lines\n"
msgstr ""
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -765,17 +764,17 @@ msgid ""
"If INPUTFILE is -, standard input is read.\n"
msgstr ""
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index 81d8c40..051c800 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index 549fd2f..ab803ca 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1999-09-24 23:45+09:00\n"
"Last-Translator: JUN SAWATAISHI <jsawa@attglobal.net>\n"
"Language-Team: \n"
@@ -81,8 +81,8 @@ msgstr "%s: ƒIƒvƒVƒ‡ƒ“ -W %s ‚͈ø”‚ğ‚Æ‚è‚Ü‚¹‚ñ\n"
msgid "memory exhausted"
msgstr "ƒƒ‚ƒŠ[‚ªŒÍŠ‰‚µ‚Ü‚µ‚½"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,8 +93,8 @@ msgstr ""
"‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·BƒRƒs[‚ÌğŒ‚ɂ‚¢‚Ă̓\[ƒX‚ğQÆ‚Ì‚±‚Æ\n"
"‚±‚̃\ƒtƒgƒEƒGƒA‚É‚Í‘S‚­•ÛØ‚ª‚ ‚è‚Ü‚¹‚ñ.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "%s ‚É‚æ‚Á‚Ä‘‚©‚ê‚Ü‚µ‚½B\n"
@@ -107,8 +107,8 @@ msgstr "ˆø”‚ª‘½‚·‚¬‚Ü‚·"
msgid "missing arguments"
msgstr "ˆø”‚ªŒ‡”@"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "%s --help ‚Å‚æ‚葽‚­‚Ìî•ñ‚ª•\¦‚³‚ê‚Ü‚·\n"
@@ -159,8 +159,8 @@ msgstr ""
"ƒƒbƒZ[ƒW‚Í–|–󂳂ê‚Ä‚¢‚é\n"
"ŒŸõƒfƒBƒŒƒNƒgƒŠ: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "ƒoƒOƒŒƒ|[ƒg‚Í <bug-gnu-utils@gnu.org> ‚Ü‚Å.\n"
@@ -225,11 +225,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "’v–½“I‚ȃGƒ‰[‚Ì”‚Í %d ‚Å‚·"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "ƒƒbƒZ[ƒW‚Ì’è‹`‚ªd•¡‚µ‚Ä‚¢‚Ü‚·"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...‚±‚ê‚Íʼn‚É’è‹`‚³‚ꂽ‚Æ‚±‚ë‚Å‚·"
@@ -240,25 +240,25 @@ msgstr "‚±‚̃ƒbƒZ[ƒW‚Í \"%s\" domain ‚Ì’†‚Å’è‹`‚³‚ê‚Ä‚Ü‚¹‚ñ"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "o—Í‚Ì€”õ’†‚É"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ‚Æ %s ‚݂͌¢‚É”r‘¼“I‚Å‚·"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "­‚È‚­‚Æ‚à“ñ‚‚̃tƒ@ƒCƒ‹‚ğw’肵‚ĉº‚³‚¢"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "‘I‘ğŠî€‚ª•s³‚Å‚· (%d < n < %d)"
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -284,7 +284,7 @@ msgstr ""
" -F, --sort-by-file ƒtƒ@ƒCƒ‹‚̈ʒu‚É‚æ‚Á‚ă\[ƒg‚·‚é\n"
" -h, --help ‚±‚̃wƒ‹ƒvƒƒbƒZ[ƒW‚ğo—Í‚µ‚ÄI—¹\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -317,7 +317,7 @@ msgstr ""
"ƒW\n"
" ‚Ì‚İo—Í‚³‚ê‚é\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -351,17 +351,17 @@ msgstr ""
"o—Í‚³‚ê‚é‚悤‚Éİ’è‚Å‚«‚Ü‚·B(—á: --less-than=2 ‚цƒj[ƒN‚ȃƒbƒZ[\n"
"ƒW‚Ì‚İ‚ğo—Í‚µ‚Ü‚·)\n"
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "\"%s\" ‚̃I[ƒvƒ“‚ŃGƒ‰["
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "‚±‚̃tƒ@ƒCƒ‹‚É‚Í domain –½—ß‚ª‚ ‚è‚Ü‚¹‚ñ"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "“ü—̓tƒ@ƒCƒ‹‚ªw’肳‚ê‚Ä‚Ü‚¹‚ñ"
@@ -779,7 +779,7 @@ msgstr ""
"%*s Œx: •¶šƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -794,24 +794,24 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
"%s: Œx: •¶šƒZƒbƒg\"%s\"‚͉”À«‚Ì‚È‚¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
"%*s Œx: •¶šƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
"%s: Œx: •¶šƒZƒbƒg\"%s\"‚͉”À«‚Ì‚È‚¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
"%*s Œx: •¶šƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
-#: src/po.c:330
+#: src/po.c:334
#, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -856,20 +856,20 @@ msgstr "%s:%d: Œx: •¶š—ñ’蔂ªŠ®Œ‹‚µ‚Ä‚¢‚Ü‚¹‚ñ"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Œx: •¶š—ñ‚ªŠ®Œ‹‚µ‚Ä‚¢‚Ü‚¹‚ñ"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing ‚Í•W€o—Í‚Éo—Í‚·‚é‚É—p‚¢‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ"
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr "ŒŸõ‚·‚ׂ«ƒL[ƒ[ƒh‚È‚µ‚Å‚Í xgettext ‚Í‹@”\‚µ‚Ü‚¹‚ñ"
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "Œx: ƒtƒ@ƒCƒ‹`%s'‚ÌŠg’£q`%s'‚ğ”F¯‚Å‚«‚Ü‚¹‚ñ; C ‚Æ‚İ‚È‚µ‚Ü‚·"
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -909,15 +909,14 @@ msgstr ""
" --foreign-user FSF ‚Ì’˜ìŒ •\¦‚ğo—Í‚µ‚È‚¢\n"
" -F, --sort-by-file ƒtƒ@ƒCƒ‹‚̈ʒu‚É‚æ‚Á‚ă\[ƒg‚µ‚Äo—Í‚·‚é\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -936,7 +935,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRING] STRING ‚È‚¢‚µ\"\"‚ğ msgstr ‚Ì suffix ‚Æ‚·‚é\n"
" --no-location '#:ƒtƒ@ƒCƒ‹–¼:s”Ô†'‚Ìs‚ğo—Í‚µ‚È‚¢\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -965,17 +964,17 @@ msgstr ""
"\n"
" “ü—̓tƒ@ƒCƒ‹‚ª - ‚Ì‚Í•W€“ü—Í‚ğ“Ç‚İ‚İ‚Ü‚·\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: Œx: ƒL[ƒ[ƒhˆø”‚ŃL[ƒ[ƒh‚ªƒlƒXƒg‚µ‚Ä‚¢‚Ü‚·"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr "%s:%d: Œx: ŠO•”ƒL[ƒ[ƒh‚Æ‚»‚̈ø”‚̊ԂɃL[ƒ[ƒh‚ª‚ ‚è‚Ü‚·"
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "Œ¾Œê %s ‚ğ”F¯‚Å‚«‚Ü‚¹‚ñ"
diff --git a/po/ko.gmo b/po/ko.gmo
index bc2813a..b794662 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
Binary files differ
diff --git a/po/ko.po b/po/ko.po
index 1bbb7ec..9389f4a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.30\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1997-09-03 12:52+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -81,8 +81,8 @@ msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
msgid "memory exhausted"
msgstr "¸Ş¸ğ¸®°¡ ¹Ù´Ú³²"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,8 +93,8 @@ msgstr ""
"ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿ş¾îÀÔ´Ï´Ù. º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n"
"À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "%s°¡ ¸¸µé¾ú½À´Ï´Ù.\n"
@@ -107,8 +107,8 @@ msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
msgid "missing arguments"
msgstr "Àμö°¡ ºüÁ³À½"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n"
@@ -158,8 +158,8 @@ msgstr ""
"Ãâ·ÂµË´Ï´Ù.\n"
"±âº» Ž»ö µğ·ºÅ丮: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "<bug-gnu-utils@gnu.org>·Î ¹®Á¦Á¡À» º¸°íÇϽʽÿÀ.\n"
@@ -223,11 +223,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "Áߺ¹µÈ ¸Ş½ÃÁö Á¤ÀÇ"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù"
@@ -238,25 +238,25 @@ msgstr "ÀÌ ¸Ş½ÃÁö´Â \"%s\" ¿µ¿ª¿¡ Á¤ÀÇ°¡ ¾ø½À´Ï´Ù"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "Ãâ·ÂÀ» ÁغñÇÏ´Â µ¿¾È"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s¿Í %s´Â ¼­·Î ¹èŸÀûÀÔ´Ï´Ù"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -289,7 +289,7 @@ msgstr ""
" »ı·«ÇÕ´Ï´Ù\n"
" -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -323,7 +323,7 @@ msgstr ""
"\n"
"ÀÔ·ÂÆÄÀÏÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -343,17 +343,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "Àбâ À§ÇØ \"%s\"À» ¿©´Â µ¿¾È ¿À·ù ¹ß»ı"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "ÀÌ ÆÄÀÏÀº ¿µ¿ª Áö½ÃÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖÁö ¾ÊÀ» ¼öµµ ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù"
@@ -775,7 +775,7 @@ msgid ""
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -790,20 +790,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -845,20 +845,20 @@ msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ »ó¼ö"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-exeistingÀº Ãâ·ÂÀÌ Ç¥ÁØÃâ·Â¿¡ ¾²¿©Áú ¶§ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù"
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "°æ°í: `%s' ÆÄÀÏÀÇ È®ÀåÀÚ `%s'¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù; C Çü½ÄÀ¸·Î °£ÁÖÇÔ"
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -898,15 +898,14 @@ msgstr ""
" »ı·«ÇÕ´Ï´Ù\n"
" -F, --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -928,7 +927,7 @@ msgstr ""
" »ç¿ëÇÕ´Ï´Ù\n"
" --no-location '#: filename:line' ÇàÀ» ¾²Áö ¾Ê½À´Ï´Ù\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -957,17 +956,17 @@ msgstr ""
"\n"
"ÀÔ·ÂÆÄÀÏÀÌ - À̸é Ç¥ÁØ ÀÔ·ÂÀ» ÀĞ°Ô µË´Ï´Ù.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿­ »ó¼ö"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "`%s' ¾ğ¾î¸¦ ¾Ë ¼ö ¾øÀ½"
diff --git a/po/nl.gmo b/po/nl.gmo
index 690afde..22d54e8 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index 255b009..6a2882d 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: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1997-03-11 22:38 \n"
"Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -82,8 +82,8 @@ msgstr "%s: optie `-W %s' staat geen argument toe\n"
msgid "memory exhausted"
msgstr "Geen geheugen meer beschikbaar"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -95,8 +95,8 @@ msgstr ""
"garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n"
"SPECIFIEK DOEL.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Geschreven door %s.\n"
@@ -109,8 +109,8 @@ msgstr "te veel argumenten"
msgid "missing arguments"
msgstr "ontbrekende argumenten"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
@@ -161,8 +161,8 @@ msgstr ""
"worden de in de katalogus gevonden meldingen vertaald.\n"
"Standaard zoek directory: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Meld fouten via <bug-gnu-utils@gnu.org>.\n"
@@ -228,11 +228,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d fatale fouten gevonden"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "dubbele melding definitie"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...dit is de lokatie van de eerste definitie"
@@ -243,25 +243,25 @@ msgstr "deze melding heeft geen definitie in het \"%s\" domein"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "bij voorbereiden uitvoer"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s en %s zijn mutually exclusive"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -293,7 +293,7 @@ msgstr ""
" --foreign-user laat FSF kopierecht weg voor vreemde gebruiker\n"
" -F, --sort-by-file sorteer uitvoer bij bestandslokatie\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -328,7 +328,7 @@ msgstr ""
"\n"
"Als INVOERBESTAND - is, lees standaardinvoer.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -348,17 +348,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fout tijdens openen om te lezen van \"%s\""
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "dit bestand mag geen domein directives bevatten"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "geen invoerbestand gegeven"
@@ -785,7 +785,7 @@ msgid ""
msgstr "%s: let op: broncode bevat vage vertaling"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -800,20 +800,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: let op: broncode bevat vage vertaling"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -856,23 +856,23 @@ 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/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -911,15 +911,14 @@ msgstr ""
" --foreign-user laat FSF kopierecht weg voor vreemde gebruiker\n"
" -F, --sort-by-file sorteer uitvoer bij bestandslokatie\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -939,7 +938,7 @@ msgstr ""
" msgstr ingangen\n"
" --no-location geen '#: filename:line' regels\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -968,17 +967,17 @@ msgstr ""
"\n"
"Als INVOERBESTAND - is, lees standaardinvoer.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: let op: niet getermineerde string literal"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "taal `%s' onbekend"
diff --git a/po/nn.gmo b/po/nn.gmo
index 9eccd5c..e52f949 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
Binary files differ
diff --git a/po/nn.po b/po/nn.po
index 06574c9..7908fca 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1996-03-21 08:46 EST\n"
"Last-Translator: Karl Anders Øygard <karlo@ifi.uio.no>\n"
"Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -81,8 +81,8 @@ msgstr "%s: flagg «--%s» tek ikkje argument\n"
msgid "memory exhausted"
msgstr ""
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -90,8 +90,8 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr ""
@@ -105,8 +105,8 @@ msgstr "manglar argument"
msgid "missing arguments"
msgstr "manglar argument"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for meir informasjon\n"
@@ -157,8 +157,8 @@ msgstr ""
"staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
@@ -222,11 +222,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%s: fann %d fatale feil"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
#, fuzzy
msgid "...this is the location of the first definition"
msgstr "den første definisjonen finst her"
@@ -238,26 +238,26 @@ msgstr "denne meldinga har ingen definisjon i \"%s\"-domenet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "under klargjering av utdata"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker kvarandre"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
#, fuzzy
msgid "at least two files must be specified"
msgstr "nøyaktig to filer må spesifiserast"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -289,7 +289,7 @@ msgstr ""
" -i, --indent lag indentert utdata\n"
" -j, --join-existing flett saman meldingar med eksisterande fil\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -318,7 +318,7 @@ msgstr ""
"\n"
"Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -338,17 +338,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, fuzzy, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under skriving av fila \"%s\""
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "denne fila kan innehalde domene-nøkkelord"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "inga innfil spesifisert"
@@ -757,7 +757,7 @@ msgid ""
msgstr "advarsel: denne meldinga er ikkje brukt"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -772,20 +772,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "advarsel: denne meldinga er ikkje brukt"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "advarsel: denne meldinga er ikkje brukt"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -828,20 +828,20 @@ msgstr ""
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -880,15 +880,14 @@ msgstr ""
" -i, --indent lag indentert utdata\n"
" -j, --join-existing flett saman meldingar med eksisterande fil\n"
-#: src/xgettext.c:550
-#, fuzzy, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -907,7 +906,7 @@ msgstr ""
" -n, --add-location lag «#: filenavn:linje»-linjer (forvalgt)\n"
" --omit-header ikkje lag startseksjon med «msgid \"\"»\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -933,17 +932,17 @@ msgstr ""
"\n"
"Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/po/no.gmo b/po/no.gmo
index 540ad83..70b8575 100644
--- a/po/no.gmo
+++ b/po/no.gmo
Binary files differ
diff --git a/po/no.po b/po/no.po
index 1b79521..cc7143c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1999-08-06 22:38+02:00\n"
"Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
"Language-Team: Norwegian-bokmål <no@li.org>\n"
@@ -84,8 +84,8 @@ msgstr "Minnet oppbrukt"
# Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
# Er denne oversettelsen grei nok?
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -96,8 +96,8 @@ msgstr ""
"Dette er fri pogramvare; se kildekoden for kopieringsbetingelser. Det finnes\n"
"INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT FORMÅL.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet av %s.\n"
@@ -110,8 +110,8 @@ msgstr "for mange argumenter"
msgid "missing arguments"
msgstr "mangler argumenter"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -161,8 +161,8 @@ msgstr ""
"stedet blir meldinger i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -226,11 +226,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "fant %d fatale feil"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "duplisert definisjon av melding"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "... dette er lokasjonen til den første definisjonen"
@@ -241,25 +241,25 @@ msgstr "denne meldingen har ingen definisjon i «%s»-domenet"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "under klargjøring av utdata"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker hverandre"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "minst to filer må angis"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -284,7 +284,7 @@ msgstr ""
" -F, --sort-by-file sorter utdata etter fillokasjon\n"
" -h, --help vise denne hjelpen og avslutte\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -316,7 +316,7 @@ msgstr ""
" -u, --unique kortform --less-than=2, krever\n"
" at bare unike meldinger blir skrevet ut\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -353,17 +353,17 @@ msgstr ""
"PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n"
"bli bevart.\n"
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under åpning av «%s» for lesing"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "denne filen kan ikke inneholde domene-direktiver"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "ingen innfil angitt"
@@ -788,7 +788,7 @@ msgid ""
msgstr "%s: advarselL: kildefil har antatte oversettelser"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -803,20 +803,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -859,21 +859,21 @@ msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -912,15 +912,14 @@ msgstr ""
" --foreign-user utelat FSF-copyright i utdata for fremmede brukere\n"
" -F, --sort-by-file sorter utdata etter fillokasjon\n"
-#: src/xgettext.c:550
-#, fuzzy, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -939,7 +938,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRENG] bruk STRENG eller «» som suffiks for msgstr-innslag\n"
" --no-location ikke skriv ut «#: filnavn:linje»-linjer\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -968,17 +967,17 @@ msgstr ""
"\n"
"Dersom INNFIL er -, lese standard inn.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "språket «%s» er ukjent"
diff --git a/po/pl.gmo b/po/pl.gmo
index 2f1ae5b..4d8f345 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index 37ad1f8..c7e894f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1998-08-05 15:00+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@pdi.net>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -84,8 +84,8 @@ msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -97,8 +97,8 @@ msgstr ""
"Autorzy nie daj± ¯ADNYCH gwarancji, w tym nawet gwarancji SPRZEDAWALNO¦CI\n"
"lub PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Zapisane przez %s.\n"
@@ -111,8 +111,8 @@ msgstr "za du¿o argumentów"
msgid "missing arguments"
msgstr "brakuj±ce argumenty"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n"
@@ -163,8 +163,8 @@ msgstr ""
"wybranym katalogu.\n"
"Domy¶lnie przeszukiwany katalog: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n"
@@ -228,11 +228,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "znaleziono %d b³êdów krytycznych"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "podwójna definicja komunikatu"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...to jest po³o¿enie pierwszej definicji"
@@ -243,25 +243,25 @@ msgstr "ten komunikat nie ma definicji w domenie \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "podczas przygotowywania wyniku"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s i %s wzajemnie siê wykluczaj±"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "musz± byæ podane przynajmniej dwa pliki"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)"
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -286,7 +286,7 @@ msgstr ""
" -F, --sort-by-file sortuj wyniki wg po³o¿enia plików\n"
" -h, --help wy¶wietl ten opis i zakoñcz pracê\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -318,7 +318,7 @@ msgstr ""
" -u, --unique skrót dla --less-than=2, bêd± wypisane\n"
" tylko unikalne komunikaty\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -355,17 +355,17 @@ 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:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "b³±d w czasie otwierania \"%s\" do czytania"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "nie podano nazwy pliku wej¶ciowego"
@@ -787,7 +787,7 @@ msgid ""
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -802,20 +802,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -857,20 +857,20 @@ msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -910,15 +910,14 @@ msgstr ""
" --foreign-user omiñ informacjê o prawach autorskich FSF\n"
" -F, --sort-by-file sortuj wyniki wg po³o¿enia plików\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -937,7 +936,7 @@ msgstr ""
" -M, --msgstr-suffix[=£AÑCUCH] u¿yj £AÑCUCH lub \"\" jako przyrostka msgstr\n"
" --no-location nie zapisuj linii '#: nazwa_pliku:linia'\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -964,17 +963,17 @@ msgstr ""
" -w, --width=LICZBA ustal szeroko¶æ strony\n"
" -x, --exclude-file=PLIK nie wydobywaj rekordów zapisanych w PLIKu\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "nieznany jêzyk `%s'"
diff --git a/po/pt.gmo b/po/pt.gmo
index 58a5179..1a9afbe 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
Binary files differ
diff --git a/po/pt.po b/po/pt.po
index a514938..71d3c9b 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: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
"Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -81,8 +81,8 @@ msgstr "%s: a opção `--%s' não permite um argumento\n"
msgid "memory exhausted"
msgstr "memória exausta"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -90,8 +90,8 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr ""
@@ -104,8 +104,8 @@ msgstr "demasiados argumentos"
msgid "missing arguments"
msgstr "argumentos insuficientes"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informação\n"
@@ -157,8 +157,8 @@ msgstr ""
"são traduzidas.\n"
"Directório standard de pesquisa: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
@@ -226,11 +226,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "encontrados %d erros fatais"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "definição de mensagem duplicada"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...este é o local da primeira definição"
@@ -241,25 +241,25 @@ msgstr "esta mensagem não tem definição no domínio \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "durante a preparação da saída"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s são mutuamente exclusivas"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -297,7 +297,7 @@ msgstr ""
" vazio\n"
" -F, --sort-by-file ordena a saída pela localização dos ficheiros\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -334,7 +334,7 @@ msgstr ""
"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) é\n"
"usado.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -354,17 +354,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro durante a abertura de \"%s\" para leitura"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "este ficheiro não pode conter directivas de domínio"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "nenhum ficheiro de entrada fornecido"
@@ -802,7 +802,7 @@ msgid ""
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -817,20 +817,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -874,24 +874,24 @@ msgstr ""
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -936,15 +936,14 @@ msgstr ""
" vazio\n"
" -F, --sort-by-file ordena a saída pela localização dos ficheiros\n"
-#: src/xgettext.c:550
-#, fuzzy, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -966,7 +965,7 @@ msgstr ""
" `msgstr'\n"
" --no-location não escreve linhas do tipo '#: filename:line'\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -999,17 +998,17 @@ msgstr ""
"Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) é\n"
"usado.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/po/sl.gmo b/po/sl.gmo
index ae02179..ec6d0ec 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
Binary files differ
diff --git a/po/sl.po b/po/sl.po
index af55412..72cb027 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.24\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1996-09-12 21:15\n"
"Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -84,8 +84,8 @@ msgstr "%s: izbira ,--%s' ne dovoljuje argumenta\n"
msgid "memory exhausted"
msgstr "pomnilnik izèrpan"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -93,8 +93,8 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr ""
@@ -107,8 +107,8 @@ msgstr "preveè argumentov"
msgid "missing arguments"
msgstr "argumenti manjkajo"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help' za izèrpnej¹a navodila\n"
@@ -158,8 +158,8 @@ msgstr ""
"sporoèil.\n"
"Privzet imenik s katalogom sporoèil: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
@@ -223,11 +223,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d kritiènih napak"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "podvojena definicija sporoèila"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...to je kraj prve definicije"
@@ -238,26 +238,26 @@ msgstr "to sporoèilo ni definirano v domeni \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "med pripravo izpisa"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s in %s se med seboj izkljuèujeta"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
# POZOR! Nepopolni prevodi
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -288,7 +288,7 @@ msgstr ""
" -F, --sort-by-file izhod sortiramo po lokaciji datotek\n"
# POZOR! Nepopolni prevodi
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -320,7 +320,7 @@ msgstr ""
"\n"
"Èe je ime vhodne datoteke - (minus), beremo s standardnega vhoda.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -340,17 +340,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "datoteke \"%s\" ni moè odpreti za branje"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "ta datoteka morda ne vsebuje direktiv domene"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "vhodna datoteka ni podana"
@@ -769,7 +769,7 @@ msgid ""
msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -784,20 +784,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -840,21 +840,21 @@ msgstr ""
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, fuzzy, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "pozor: tip datoteke ,%s' s pripono ,%s' ni prepoznan; posku¹amo C"
# POZOR! Nepopolni prevodi
-#: src/xgettext.c:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -891,15 +891,14 @@ msgstr ""
" --force-po datoteko PO zapi¹emo, èetudi je prazna\n"
" -F, --sort-by-file izhod sortiramo po lokaciji datotek\n"
-#: src/xgettext.c:550
-#, fuzzy, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -918,7 +917,7 @@ msgstr ""
" --no-location brez vrstic '#: filename:line'\n"
# POZOR! Nepopolni prevodi
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, fuzzy, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -946,17 +945,17 @@ msgstr ""
"\n"
"Èe je ime vhodne datoteke - (minus), beremo s standardnega vhoda.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr ""
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr ""
diff --git a/po/sv.gmo b/po/sv.gmo
index 2c4e8ab..5720c08 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index c05eb3c..ab509ba 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 1996-12-31 23:59\n"
"Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -82,8 +82,8 @@ msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
msgid "memory exhausted"
msgstr "Minnet slut"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -95,8 +95,8 @@ msgstr ""
"INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
"ÄNDAMÅL.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "Skriven av %s.\n"
@@ -109,8 +109,8 @@ msgstr "för många argument"
msgid "missing arguments"
msgstr "argument saknas"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Försök med \"%s --help\" för mer information.\n"
@@ -160,8 +160,8 @@ msgstr ""
"översätts de argument som hittas i den valda meddelandekatalogen.\n"
"Normal katalog för meddelandekataloger: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"Rapportera fel till <bug-gnu-utils@gnu.org>.\n"
@@ -227,11 +227,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d allvarliga fel hittades"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "meddelandedefinitionen är duplicerad"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...detta är platsen för den första definitionen"
@@ -242,25 +242,25 @@ msgstr "detta meddelande har ingen definition i domänen \"%s\""
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "när resultatet förbereddes"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s och %s är ömsesidigt uteslutande"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -292,7 +292,7 @@ msgstr ""
" --foreign-user utelämna FSF copyright-text i resultatet\n"
" -F, --sort-by-file sortera resultatet efter filposition\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
#, fuzzy
msgid ""
" -i, --indent write the .po file using indented style\n"
@@ -327,7 +327,7 @@ msgstr ""
"\n"
"Om INFIL är - så läses standard in.\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -347,17 +347,17 @@ msgid ""
"preserved.\n"
msgstr ""
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fel uppstod när \"%s\" öppnades för läsning"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "denna fil kan inte innehålla domändirektiv"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "inga infiler givna"
@@ -782,7 +782,7 @@ msgid ""
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -797,20 +797,20 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, fuzzy, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
-#: src/po.c:330
+#: src/po.c:334
#, fuzzy, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -853,21 +853,21 @@ msgstr "%s:%d: varning: oavslutad teckenkonstant"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: varning: oavslutad sträng"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
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:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, fuzzy, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -906,15 +906,14 @@ msgstr ""
" --foreign-user utelämna FSF copyright-text i resultatet\n"
" -F, --sort-by-file sortera resultatet efter filposition\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -933,7 +932,7 @@ msgstr ""
" -M, --msgstr-suffix[=STRÄNG] avsluta översatta strängar med STRÄNG eller \"\"\n"
" --no-location skriv inte ut raderna \"#: filnamn:rad\"\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -963,17 +962,17 @@ msgstr ""
"\n"
"Om INFIL är - så läses standard in.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: varning: oavslutad sträng"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "språket \"%s\" okänt"
diff --git a/po/tr.gmo b/po/tr.gmo
index 858b6da..c96973b 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/tr.po b/po/tr.po
index 3eda29e..5c11248 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext-0.10.35\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
"PO-Revision-Date: 2000-11-05 23:43+200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -82,8 +82,8 @@ msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
msgid "memory exhausted"
msgstr "Bellek tükendi"
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -95,8 +95,8 @@ msgstr ""
"Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
"UYGUNLUĞU için bile garanti verilmez.\n"
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
#, c-format
msgid "Written by %s.\n"
msgstr "%s tarafından yazıldı.\n"
@@ -109,8 +109,8 @@ msgstr "çok fazla argüman"
msgid "missing arguments"
msgstr "argümankar kayıp"
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Daha fazla bilgilendirilmek için `%s --help' yazın.\n"
@@ -164,8 +164,8 @@ msgstr ""
"çevrilmiş ileti kataloğunun bulunması gereken dizini aşağıdaki gibi verir:\n"
"Standard arama dizini: %s\n"
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "Hataları <bug-gnu-utils@gnu.org> adresine bildirin.\n"
@@ -229,11 +229,11 @@ msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d ölümcül hata bulundu"
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
msgid "duplicate message definition"
msgstr "ileti iki defa tanımlanmış"
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
msgid "...this is the location of the first definition"
msgstr "...bu ilk tanımlamanın konumu"
@@ -244,25 +244,25 @@ msgstr "\"%s\" makinasında bu ileti tanımlaması yok"
#. We are about to construct the absolute path to the
#. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
msgid "while preparing output"
msgstr "çıktıyı hazırlarken"
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ve %s karşılıklı olarak diğeri ile bağdaşmıyor"
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
msgid "at least two files must be specified"
msgstr "en az iki dosya belirtilmelidir"
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -288,7 +288,7 @@ msgstr ""
" -F, --sort-by-file dosya konumuna göre çıktıyı sıralar\n"
" -h, --help bu yardım iletisini gösterir ve çıkar\n"
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
msgid ""
" -i, --indent write the .po file using indented style\n"
" --no-location do not write '#: filename:line' lines\n"
@@ -321,7 +321,7 @@ msgstr ""
" -u, --unique --less-than=2 içi kısalma, yalnız tekbaşına\n"
"\t\t\t\tiletiler gösterildiğinde istenir\n"
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
msgid ""
" -V, --version output version information and exit\n"
" -w, --width=NUMBER set output page width\n"
@@ -362,17 +362,17 @@ msgstr ""
"korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları korunmuş "
"olacaktır.\n"
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "\"%s\" okumak için açılırken hata"
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
msgid "this file may not contain domain directives"
msgstr "bu dosya makina talimatlarını içeremez"
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
msgid "no input file given"
msgstr "hiç girdi dosyası verilmemiş"
@@ -798,7 +798,7 @@ msgid ""
msgstr ""
#. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
msgid ", expect parse errors"
msgstr ""
@@ -813,20 +813,20 @@ msgstr ""
#, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
#. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
+#: src/po.c:318
#, c-format
msgid ""
"%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s warning: consider installing GNU libiconv and then\n"
+"%*s reinstalling GNU gettext"
msgstr ""
-#: src/po.c:330
+#: src/po.c:334
#, c-format
msgid ""
"%s: warning: charset missing in header\n"
@@ -868,20 +868,20 @@ msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uyarı: sonlandırılmamış dizi harfi"
-#: src/xgettext.c:383
+#: src/xgettext.c:373
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "standard çıktıya yazılırken --join-existing kullanılamaz"
-#: src/xgettext.c:388
+#: src/xgettext.c:378
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:494
+#: src/xgettext.c:484
#, 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:530
+#: src/xgettext.c:520
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] INPUTFILE ...\n"
@@ -921,15 +921,14 @@ msgstr ""
"\t\t\t\tFSF kopyahakkı uyarısını göstermez\n"
" -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n"
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
msgid ""
" -h, --help display this help and exit\n"
" -i, --indent write the .po file using indented style\n"
" -j, --join-existing join messages with existing file\n"
" -k, --keyword[=WORD] additonal keyword to be looked for (without\n"
" WORD means not to use default keywords)\n"
-" -l, --string-limit=NUMBER set string length limit to NUMBER instead %u\n"
" -L, --language=NAME recognise the specified language (C, C++, PO),\n"
" otherwise is guessed from file extension\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
@@ -952,7 +951,7 @@ msgstr ""
"\t\t\t\tDİZİ kullanılır\n"
" --no-location '#: dosyaismi:satır' satırlarını yazmaz\n"
-#: src/xgettext.c:564
+#: src/xgettext.c:552
#, no-wrap
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
@@ -982,17 +981,17 @@ msgstr ""
"\n"
"girdidosyası olarak - verilmişse standard girdi okunur.\n"
-#: src/xgettext.c:926
+#: src/xgettext.c:914
#, fuzzy, c-format
msgid "%s:%d: warning: keyword nested in keyword arg"
msgstr "%s:%d: uyarı: sonlandırılmamış dizi harfi"
-#: src/xgettext.c:936
+#: src/xgettext.c:924
#, c-format
msgid "%s:%d: warning: keyword between outer keyword and its arg"
msgstr ""
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
#, c-format
msgid "language `%s' unknown"
msgstr "lisan `%s' bilinmiyor"
diff --git a/src/Makefile.in b/src/Makefile.in
index e179b88..8c12383 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,7 +94,7 @@ lispdir = @lispdir@
AUTOMAKE_OPTIONS = 1.2 gnits
-bin_PROGRAMS = gettext msgcmp msgfmt msgmerge msgunfmt xgettext msgcomm
+bin_PROGRAMS = gettext ngettext msgcmp msgfmt msgmerge msgunfmt xgettext msgcomm
noinst_HEADERS = pos.h message.h po-gram.h po-hash.h po-lex.h po.h open-po.h str-list.h write-po.h xget-lex.h dir-list.h po-gram-gen.h po-hash-gen.h
@@ -114,6 +114,7 @@ YACC = @YACC@ -d
# Source dependencies.
gettext_SOURCES = gettext.c
+ngettext_SOURCES = ngettext.c
msgcmp_SOURCES = message.c msgcmp.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c dir-list.c
msgfmt_SOURCES = msgfmt.c open-po.c po-gram-gen.y po-hash-gen.y po-lex.c po.c str-list.c message.c dir-list.c
@@ -142,8 +143,9 @@ DISTCLEANFILES = po-gram-gen2.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-bin_PROGRAMS = gettext$(EXEEXT) msgcmp$(EXEEXT) msgfmt$(EXEEXT) \
-msgmerge$(EXEEXT) msgunfmt$(EXEEXT) xgettext$(EXEEXT) msgcomm$(EXEEXT)
+bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) msgcmp$(EXEEXT) \
+msgfmt$(EXEEXT) msgmerge$(EXEEXT) msgunfmt$(EXEEXT) xgettext$(EXEEXT) \
+msgcomm$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
CPPFLAGS = @CPPFLAGS@
@@ -153,6 +155,10 @@ gettext_OBJECTS = gettext.$(OBJEXT)
gettext_LDADD = $(LDADD)
gettext_DEPENDENCIES = ../lib/libnlsut.a
gettext_LDFLAGS =
+ngettext_OBJECTS = ngettext.$(OBJEXT)
+ngettext_LDADD = $(LDADD)
+ngettext_DEPENDENCIES = ../lib/libnlsut.a
+ngettext_LDFLAGS =
msgcmp_OBJECTS = message.$(OBJEXT) msgcmp.$(OBJEXT) open-po.$(OBJEXT) \
po-gram-gen.$(OBJEXT) po-hash-gen.$(OBJEXT) po-lex.$(OBJEXT) \
po.$(OBJEXT) str-list.$(OBJEXT) dir-list.$(OBJEXT)
@@ -201,8 +207,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
-SOURCES = $(gettext_SOURCES) $(msgcmp_SOURCES) $(msgfmt_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(xgettext_SOURCES) $(msgcomm_SOURCES)
-OBJECTS = $(gettext_OBJECTS) $(msgcmp_OBJECTS) $(msgfmt_OBJECTS) $(msgmerge_OBJECTS) $(msgunfmt_OBJECTS) $(xgettext_OBJECTS) $(msgcomm_OBJECTS)
+SOURCES = $(gettext_SOURCES) $(ngettext_SOURCES) $(msgcmp_SOURCES) $(msgfmt_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(xgettext_SOURCES) $(msgcomm_SOURCES)
+OBJECTS = $(gettext_OBJECTS) $(ngettext_OBJECTS) $(msgcmp_OBJECTS) $(msgfmt_OBJECTS) $(msgmerge_OBJECTS) $(msgunfmt_OBJECTS) $(xgettext_OBJECTS) $(msgcomm_OBJECTS)
all: all-redirect
.SUFFIXES:
@@ -288,6 +294,10 @@ gettext$(EXEEXT): $(gettext_OBJECTS) $(gettext_DEPENDENCIES)
@rm -f gettext$(EXEEXT)
$(LINK) $(gettext_LDFLAGS) $(gettext_OBJECTS) $(gettext_LDADD) $(LIBS)
+ngettext$(EXEEXT): $(ngettext_OBJECTS) $(ngettext_DEPENDENCIES)
+ @rm -f ngettext$(EXEEXT)
+ $(LINK) $(ngettext_LDFLAGS) $(ngettext_OBJECTS) $(ngettext_LDADD) $(LIBS)
+
msgcmp$(EXEEXT): $(msgcmp_OBJECTS) $(msgcmp_DEPENDENCIES)
@rm -f msgcmp$(EXEEXT)
$(LINK) $(msgcmp_LDFLAGS) $(msgcmp_OBJECTS) $(msgcmp_LDADD) $(LIBS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0dccd24..5150b3b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -96,14 +96,14 @@ lispdir = @lispdir@
AUTOMAKE_OPTIONS = 1.2 gnits
-TESTS = gettext-1 gettext-2 msgcmp-1 msgcmp-2 msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgunfmt-1 xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 xgettext-7 xgettext-8 xgettext-9 plural-1
+TESTS = gettext-1 gettext-2 msgcmp-1 msgcmp-2 msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgunfmt-1 xgettext-1 xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 xgettext-7 xgettext-8 xgettext-9 plural-1 plural-2
EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po
XGETTEXT = ../src/xgettext
-TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH GETTEXT=tstgettext XGETTEXT=`echo xgettext|sed '$(transform)'` MSGFMT=`echo msgfmt|sed '$(transform)'` MSGCMP=`echo msgcmp|sed '$(transform)'` MSGMERGE=`echo msgmerge|sed '$(transform)'` MSGUNFMT=`echo msgunfmt|sed '$(transform)'` $(SHELL)
+TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH GETTEXT=tstgettext NGETTEXT=tstngettext XGETTEXT=`echo xgettext|sed '$(transform)'` MSGFMT=`echo msgfmt|sed '$(transform)'` MSGCMP=`echo msgcmp|sed '$(transform)'` MSGMERGE=`echo msgmerge|sed '$(transform)'` MSGUNFMT=`echo msgunfmt|sed '$(transform)'` $(SHELL)
# Two auxiliary programs used by the tests.
@@ -112,9 +112,11 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
LDADD_yes = ../intl/libintl.la
LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
-EXTRA_PROGRAMS = tstgettext cake
+EXTRA_PROGRAMS = tstgettext tstngettext cake
tstgettext_SOURCES = tstgettext.c setlocale.c
tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)
+tstngettext_SOURCES = tstngettext.c setlocale.c
+tstngettext_LDADD = ../lib/libnlsut.a $(LDADD)
cake_SOURCES = plural-1-prg.c setlocale.c
CLEANFILES = $(EXTRA_PROGRAMS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -126,6 +128,9 @@ LIBS = @LIBS@
tstgettext_OBJECTS = tstgettext.$(OBJEXT) setlocale.$(OBJEXT)
tstgettext_DEPENDENCIES = ../lib/libnlsut.a
tstgettext_LDFLAGS =
+tstngettext_OBJECTS = tstngettext.$(OBJEXT) setlocale.$(OBJEXT)
+tstngettext_DEPENDENCIES = ../lib/libnlsut.a
+tstngettext_LDFLAGS =
cake_OBJECTS = plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT)
cake_LDADD = $(LDADD)
cake_DEPENDENCIES =
@@ -142,8 +147,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
-SOURCES = $(tstgettext_SOURCES) $(cake_SOURCES)
-OBJECTS = $(tstgettext_OBJECTS) $(cake_OBJECTS)
+SOURCES = $(tstgettext_SOURCES) $(tstngettext_SOURCES) $(cake_SOURCES)
+OBJECTS = $(tstgettext_OBJECTS) $(tstngettext_OBJECTS) $(cake_OBJECTS)
all: all-redirect
.SUFFIXES:
@@ -204,6 +209,10 @@ tstgettext$(EXEEXT): $(tstgettext_OBJECTS) $(tstgettext_DEPENDENCIES)
@rm -f tstgettext$(EXEEXT)
$(LINK) $(tstgettext_LDFLAGS) $(tstgettext_OBJECTS) $(tstgettext_LDADD) $(LIBS)
+tstngettext$(EXEEXT): $(tstngettext_OBJECTS) $(tstngettext_DEPENDENCIES)
+ @rm -f tstngettext$(EXEEXT)
+ $(LINK) $(tstngettext_LDFLAGS) $(tstngettext_OBJECTS) $(tstngettext_LDADD) $(LIBS)
+
cake$(EXEEXT): $(cake_OBJECTS) $(cake_DEPENDENCIES)
@rm -f cake$(EXEEXT)
$(LINK) $(cake_LDFLAGS) $(cake_OBJECTS) $(cake_LDADD) $(LIBS)
generated by cgit v1.1 at 2024-08-25 20:19:34 +0000