example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
country code serves to distinguish the dialects.
+ The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc. On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
Not all programs have translations for all languages. By default, an
English message is shown in place of a nonexistent translation. If you
understand other languages, you can set up a priority list of languages.
==================
Languages are not equally supported in all packages. The following
-matrix shows the current state of internationalization, as of November
-2001. The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of January
+2002. The matrix shows, in regard of each package, for which languages
PO files have been submitted to translation coordination, with a
translation percentage of at least 50%.
- Ready PO files bg ca cs da de el en eo es et fi fr gl he hr hu id it
- +-------------------------------------------------------+
- a2ps | [] [] [] [] |
- bash | [] [] [] [] |
- bfd | [] |
- binutils | [] |
- bison | [] [] |
- clisp | [] [] [] [] |
- cpio | [] [] [] [] [] |
- diffutils | [] [] [] [] [] [] [] |
- enscript | [] [] |
- error | [] [] [] |
- fetchmail | [] |
- fileutils | [] |
- findutils | [] [] [] [] [] [] [] [] |
- flex | [] [] [] |
- freetype | |
- gas | [] |
- gawk | [] [] |
- gcal | |
- gcc | [] |
- gettext | [] [] |
- gnupg | [] [] [] [] [] [] [] |
- gprof | [] |
- grep | [] [] [] [] [] [] [] [] |
- hello | [] [] [] [] [] [] [] [] [] [] [] |
- id-utils | [] [] [] |
- indent | [] [] [] [] [] |
- jpilot | [] [] [] |
- jwhois | |
- kbd | |
- ld | [] |
- libc | [] [] [] [] [] [] [] [] |
- lilypond | [] |
- lynx | [] [] [] |
- m4 | [] [] [] [] [] [] [] |
- make | [] [] [] [] [] |
- mysecretdiary | [] |
- nano | [] [] [] [] [] [] |
- nano_1_0 | [] [] [] [] [] [] |
- opcodes | [] |
- parted | [] [] [] |
- ptx | [] [] [] [] [] [] [] |
- python | |
- recode | [] [] [] [] [] [] [] [] [] |
- sed | [] [] [] [] [] [] [] [] [] [] [] |
- sh-utils | [] [] [] [] [] [] [] [] [] |
- sharutils | [] [] [] [] [] [] [] |
- sketch | |
- soundtracker | [] [] [] |
- sp | |
- tar | [] [] [] [] [] [] [] |
- texinfo | [] [] [] [] [] |
- textutils | [] [] [] [] |
- util-linux | [] [] [] |
- wdiff | [] [] [] [] |
- wget | [] [] [] [] [] [] [] [] [] |
- +-------------------------------------------------------+
- bg ca cs da de el en eo es et fi fr gl he hr hu id it
- 0 3 11 28 33 9 1 8 22 13 1 40 20 4 0 2 7 8
+ Ready PO files bg ca cs da de el en eo es et fi fr
+ +-------------------------------------+
+ a2ps | [] [] [] [] |
+ bash | [] [] [] [] |
+ bfd | [] [] |
+ binutils | [] [] |
+ bison | [] [] [] |
+ clisp | [] [] [] [] |
+ cpio | [] [] [] [] |
+ diffutils | [] [] [] [] [] [] |
+ enscript | [] [] |
+ error | [] [] |
+ fetchmail | () [] [] [] () |
+ fileutils | [] [] [] [] [] |
+ findutils | [] [] [] [] [] |
+ flex | [] [] [] |
+ gas | [] |
+ gawk | [] [] |
+ gcal | [] [] |
+ gcc | [] [] |
+ gettext | [] [] [] [] [] |
+ gnupg | [] [] [] [] [] [] |
+ gprof | [] [] |
+ grep | [] [] [] [] [] [] |
+ hello | [] [] [] [] [] [] [] [] |
+ id-utils | [] [] [] |
+ indent | [] [] [] [] |
+ jpilot | () [] [] [] |
+ jwhois | [] [] |
+ kbd | [] |
+ ld | [] [] |
+ libc | [] [] [] [] [] [] [] |
+ lilypond | [] [] |
+ lynx | [] [] [] [] |
+ m4 | [] [] [] [] [] |
+ make | [] [] [] [] |
+ mysecretdiary | [] [] |
+ nano | [] () [] [] [] [] |
+ nano_1_0 | [] () [] [] [] [] |
+ opcodes | [] [] [] |
+ parted | [] [] [] [] |
+ ptx | [] [] [] [] [] |
+ python | |
+ recode | [] [] [] [] [] [] |
+ sed | [] [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] [] [] [] [] [] |
+ sharutils | [] [] [] [] [] [] |
+ sketch | () [] () |
+ soundtracker | [] [] [] |
+ sp | |
+ tar | [] [] [] [] [] [] |
+ texinfo | [] [] [] [] [] |
+ textutils | [] [] [] [] |
+ util-linux | [] [] [] [] |
+ wdiff | [] [] [] [] [] |
+ wget | [] [] [] [] [] [] [] [] |
+ +-------------------------------------+
+ bg ca cs da de el en eo es et fi fr
+ 0 8 12 31 36 9 1 9 37 15 1 49
+
+ gl he hr hu id it ja ko lv nb nl nn
+ +-------------------------------------+
+ a2ps | () () [] |
+ bash | |
+ bfd | [] |
+ binutils | [] |
+ bison | [] |
+ clisp | [] |
+ cpio | [] [] [] |
+ diffutils | [] [] |
+ enscript | [] |
+ error | [] |
+ fetchmail | |
+ fileutils | [] [] |
+ findutils | [] [] [] [] [] [] |
+ flex | [] |
+ gas | |
+ gawk | [] |
+ gcal | |
+ gcc | [] |
+ gettext | [] |
+ gnupg | [] [] [] |
+ gprof | |
+ grep | [] [] |
+ hello | [] [] [] [] [] [] [] [] [] |
+ id-utils | [] |
+ indent | [] [] [] |
+ jpilot | () () |
+ jwhois | |
+ kbd | |
+ ld | |
+ libc | [] [] [] [] |
+ lilypond | [] [] |
+ lynx | [] [] |
+ m4 | [] [] [] [] |
+ make | [] [] [] [] |
+ mysecretdiary | |
+ nano | [] [] [] () () [] |
+ nano_1_0 | [] [] [] () () [] |
+ opcodes | |
+ parted | [] [] [] |
+ ptx | [] [] [] [] |
+ python | |
+ recode | [] [] [] |
+ sed | [] [] [] [] [] [] [] |
+ sh-utils | [] [] [] [] [] |
+ sharutils | [] [] [] |
+ sketch | () |
+ soundtracker | [] |
+ sp | |
+ tar | [] [] [] |
+ texinfo | [] [] [] |
+ textutils | [] [] |
+ util-linux | () [] |
+ wdiff | |
+ wget | [] [] [] [] [] |
+ +-------------------------------------+
+ gl he hr hu id it ja ko lv nb nl nn
+ 20 6 1 3 6 11 22 9 1 6 17 4
- ja ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
- +-------------------------------------------------------+
- a2ps | [] [] [] [] | 8
- bash | | 4
- bfd | | 1
- binutils | [] | 2
- bison | [] [] [] | 5
- clisp | [] | 5
- cpio | [] [] [] [] [] [] | 11
- diffutils | [] [] [] [] | 11
- enscript | [] [] [] | 5
- error | [] [] | 5
- fetchmail | | 1
- fileutils | [] [] | 3
- findutils | [] [] [] [] [] [] [] [] [] | 17
- flex | [] [] [] | 6
- freetype | | 0
- gas | | 1
- gawk | [] | 3
- gcal | [] | 1
- gcc | | 1
- gettext | [] [] | 4
- gnupg | [] [] [] [] | 11
- gprof | | 1
- grep | [] [] [] [] | 12
- hello | [] [] [] [] [] [] [] [] [] [] [] [] | 23
- id-utils | [] [] [] | 6
- indent | [] [] [] [] [] [] [] | 12
- jpilot | | 3
- jwhois | | 0
- kbd | [] [] | 2
- ld | [] | 2
- libc | [] [] [] [] [] [] [] [] [] | 17
- lilypond | [] [] [] | 4
- lynx | [] [] [] [] [] | 8
- m4 | [] [] [] [] [] | 12
- make | [] [] [] [] [] [] [] | 12
- mysecretdiary | [] | 2
- nano | [] [] [] | 9
- nano_1_0 | [] | 7
- opcodes | [] [] | 3
- parted | [] [] [] [] | 7
- ptx | [] [] [] [] [] [] [] [] | 15
- python | | 0
- recode | [] [] [] [] | 13
- sed | [] [] [] [] [] [] [] [] [] | 20
- sh-utils | [] [] [] [] [] [] [] [] [] [] [] [] | 21
- sharutils | [] [] [] [] | 11
- sketch | | 0
- soundtracker | | 3
- sp | | 0
- tar | [] [] [] [] [] [] [] [] | 15
- texinfo | [] [] [] | 8
- textutils | [] [] [] [] [] [] [] | 11
- util-linux | [] [] [] | 6
- wdiff | [] [] [] [] | 8
- wget | [] [] [] [] [] [] [] [] | 17
- +-------------------------------------------------------+
- 35 teams ja ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
- 55 domains 16 8 1 6 17 0 6 15 2 11 23 9 9 35 23 3 1 395
+ no pl pt pt_BR ru sk sl sv tr uk zh
+ +-------------------------------------+
+ a2ps | () () () [] [] [] () | 8
+ bash | | 4
+ bfd | [] [] | 5
+ binutils | [] | 4
+ bison | [] [] [] | 7
+ clisp | | 5
+ cpio | [] [] [] [] | 11
+ diffutils | [] [] [] | 11
+ enscript | [] [] [] | 6
+ error | [] [] | 5
+ fetchmail | () () | 3
+ fileutils | [] [] [] [] | 11
+ findutils | [] [] [] [] [] [] | 17
+ flex | [] [] | 6
+ gas | [] | 2
+ gawk | [] [] | 5
+ gcal | [] | 3
+ gcc | [] | 4
+ gettext | [] [] [] [] | 10
+ gnupg | [] [] [] | 12
+ gprof | [] [] | 4
+ grep | [] [] [] [] [] | 13
+ hello | [] [] [] [] [] [] [] | 24
+ id-utils | [] [] | 6
+ indent | [] [] [] [] | 11
+ jpilot | () () | 3
+ jwhois | () () | 2
+ kbd | [] [] | 3
+ ld | [] [] | 4
+ libc | [] [] [] [] [] [] | 17
+ lilypond | [] | 5
+ lynx | [] [] [] | 9
+ m4 | [] [] [] | 12
+ make | [] [] [] [] | 12
+ mysecretdiary | [] | 3
+ nano | () [] [] [] | 12
+ nano_1_0 | () [] [] [] | 12
+ opcodes | [] [] | 5
+ parted | [] [] [] | 10
+ ptx | [] [] [] [] [] [] | 15
+ python | | 0
+ recode | [] [] [] [] | 13
+ sed | [] [] [] [] [] [] | 21
+ sh-utils | [] [] [] [] [] [] [] [] [] | 22
+ sharutils | [] [] | 11
+ sketch | () | 1
+ soundtracker | | 4
+ sp | | 0
+ tar | [] [] [] [] [] [] [] | 16
+ texinfo | [] [] | 10
+ textutils | [] [] | 8
+ util-linux | [] [] [] | 8
+ wdiff | [] [] [] [] | 9
+ wget | [] [] [] [] [] [] | 19
+ +-------------------------------------+
+ 35 teams no pl pt pt_BR ru sk sl sv tr uk zh
+ 54 domains 5 12 2 11 25 10 11 39 29 4 1 463
Some counters in the preceding matrix are higher than the number of
visible blocks let us expect. This is because a few extra PO files are
lag between the mere existence a PO file and its wide availability in a
distribution.
- If November 2001 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites. The most
-up-to-date matrix with full percentage details can be found at
+ If January 2002 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
+matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
Using `gettext' in new packages
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL_AMFLAGS = -I m4
gettextsrcdir = $(datadir)/gettext
gettextsrc_DATA = ABOUT-NLS
+gettextsrc_SCRIPTS = config.rpath
SUBDIRS = doc intl intl-java lib src po man m4 projects misc tests
-EXTRA_DIST = BUGS DISCLAIM README.gemtext README-alpha \
+EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
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
+ os2/README.OS2 os2/Makefile os2/backward.def \
+ os2/iconv/README os2/configure.awk
+
+
+# Subdirectories with separate autoconfiguration.
+CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/aclocal.m4 $(srcdir)/tests/rpathx/configure
+
+CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/aclocal.m4 $(srcdir)/tests/rpathy/configure
+
+CONFIGURES_RPATHLX = $(srcdir)/tests/rpathlx/Makefile.in $(srcdir)/tests/rpathlx/aclocal.m4 $(srcdir)/tests/rpathlx/configure
+
+CONFIGURES_RPATHLY = $(srcdir)/tests/rpathly/Makefile.in $(srcdir)/tests/rpathly/aclocal.m4 $(srcdir)/tests/rpathly/configure
+
+CONFIGURES_RPATHLYX = $(srcdir)/tests/rpathlyx/Makefile.in $(srcdir)/tests/rpathlyx/aclocal.m4 $(srcdir)/tests/rpathlyx/configure
+
+SUBCONFIGURES = $(CONFIGURES_RPATHX) $(CONFIGURES_RPATHY) $(CONFIGURES_RPATHLX) $(CONFIGURES_RPATHLY) $(CONFIGURES_RPATHLYX)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = intl/Makefile
+SCRIPTS = $(gettextsrc_SCRIPTS)
+
depcomp =
DIST_SOURCES =
DATA = $(gettextsrc_DATA)
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/flex.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
+$(ACLOCAL_M4): configure.in m4/backupfile.m4 m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/flex.m4 m4/fnmatch.m4 m4/getline.m4 m4/gettext.m4 m4/glibc21.m4 m4/hostname.m4 m4/iconv.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/javacomp.m4 m4/javaexec.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/libtool.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/mbswidth.m4 m4/mkdtemp.m4 m4/progtest.m4 m4/setenv.m4 m4/setlocale.m4 m4/siginfo.m4 m4/signalblocking.m4 m4/signed.m4 m4/ssize_t.m4 m4/stdbool.m4 m4/stdint_h.m4 m4/tmpdir.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/unionwait.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h
@if test ! -f $@; then \
-rm -f config.h
intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+install-gettextsrcSCRIPTS: $(gettextsrc_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+ @list='$(gettextsrc_SCRIPTS)'; for p in $$list; do \
+ f="`echo $$p|sed '$(transform)'`"; \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(gettextsrcdir)/$$f"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(gettextsrcdir)/$$f; \
+ elif test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(gettextsrcdir)/$$f; \
+ else :; fi; \
+ done
+
+uninstall-gettextsrcSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(gettextsrc_SCRIPTS)'; for p in $$list; do \
+ f="`echo $$p|sed '$(transform)'`"; \
+ echo " rm -f $(DESTDIR)$(gettextsrcdir)/$$f"; \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$f; \
+ done
uninstall-info-am:
install-gettextsrcDATA: $(gettextsrc_DATA)
@$(NORMAL_INSTALL)
distdir: $(DISTFILES)
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/djgpp $(distdir)/intl $(distdir)/lib $(distdir)/man $(distdir)/misc $(distdir)/os2 $(distdir)/po $(distdir)/src
+ $(mkinstalldirs) $(distdir)/djgpp $(distdir)/intl $(distdir)/lib $(distdir)/man $(distdir)/misc $(distdir)/os2 $(distdir)/os2/iconv $(distdir)/po $(distdir)/src
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
sed 'h;s/./=/g;p;x;p;x'
check-am: all-am
check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile $(SCRIPTS) $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir) $(DESTDIR)$(gettextsrcdir)
install: install-recursive
install-exec: install-exec-recursive
info-am:
-install-data-am: install-gettextsrcDATA
+install-data-am: install-gettextsrcDATA install-gettextsrcSCRIPTS
install-exec-am:
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-uninstall-am: uninstall-gettextsrcDATA uninstall-info-am
+uninstall-am: uninstall-gettextsrcDATA uninstall-gettextsrcSCRIPTS \
+ uninstall-info-am
uninstall-info: uninstall-info-recursive
dvi dvi-am dvi-recursive info info-am info-recursive install \
install-am install-data install-data-am install-data-recursive \
install-exec install-exec-am install-exec-recursive \
- install-gettextsrcDATA install-info install-info-am \
- install-info-recursive install-man install-recursive \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am installdirs-recursive maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- tags tags-recursive uninstall uninstall-am \
- uninstall-gettextsrcDATA uninstall-info-am \
+ install-gettextsrcDATA install-gettextsrcSCRIPTS install-info \
+ install-info-am install-info-recursive install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-gettextsrcDATA \
+ uninstall-gettextsrcSCRIPTS uninstall-info-am \
uninstall-info-recursive uninstall-recursive
html:
cd doc && $(MAKE) html
+$(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.in
+ cd $(srcdir)/tests/rpathx && automake Makefile
+$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.in
+ cd $(srcdir)/tests/rpathx && aclocal -I ../../m4
+$(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.in $(srcdir)/tests/rpathx/aclocal.m4
+ cd $(srcdir)/tests/rpathx && autoconf
+$(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.in
+ cd $(srcdir)/tests/rpathy && automake Makefile
+$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+ cd $(srcdir)/tests/rpathy && aclocal -I ../../m4
+$(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.in $(srcdir)/tests/rpathy/aclocal.m4
+ cd $(srcdir)/tests/rpathy && autoconf
+$(srcdir)/tests/rpathlx/Makefile.in: $(srcdir)/tests/rpathlx/Makefile.am $(srcdir)/tests/rpathlx/configure.in
+ cd $(srcdir)/tests/rpathlx && automake Makefile
+$(srcdir)/tests/rpathlx/aclocal.m4: $(srcdir)/tests/rpathlx/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+ cd $(srcdir)/tests/rpathlx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlx/configure: $(srcdir)/tests/rpathlx/configure.in $(srcdir)/tests/rpathlx/aclocal.m4
+ cd $(srcdir)/tests/rpathlx && autoconf
+$(srcdir)/tests/rpathly/Makefile.in: $(srcdir)/tests/rpathly/Makefile.am $(srcdir)/tests/rpathly/configure.in
+ cd $(srcdir)/tests/rpathly && automake Makefile
+$(srcdir)/tests/rpathly/aclocal.m4: $(srcdir)/tests/rpathly/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+ cd $(srcdir)/tests/rpathly && aclocal -I ../../m4
+$(srcdir)/tests/rpathly/configure: $(srcdir)/tests/rpathly/configure.in $(srcdir)/tests/rpathly/aclocal.m4
+ cd $(srcdir)/tests/rpathly && autoconf
+$(srcdir)/tests/rpathlyx/Makefile.in: $(srcdir)/tests/rpathlyx/Makefile.am $(srcdir)/tests/rpathlyx/configure.in
+ cd $(srcdir)/tests/rpathlyx && automake Makefile
+$(srcdir)/tests/rpathlyx/aclocal.m4: $(srcdir)/tests/rpathlyx/configure.in $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+ cd $(srcdir)/tests/rpathlyx && aclocal -I ../../m4
+$(srcdir)/tests/rpathlyx/configure: $(srcdir)/tests/rpathlyx/configure.in $(srcdir)/tests/rpathlyx/aclocal.m4
+ cd $(srcdir)/tests/rpathlyx && autoconf
+
+subconfigures: $(SUBCONFIGURES)
+
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: subconfigures
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
]) # _AM_DIRNAME
-#serial 1
+# flex.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Check for flex.
AC_SUBST(LEX_OUTPUT_ROOT)
])
-#serial 1
+# javacomp.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites of javacomp.sh.
# Sets HAVE_JAVACOMP to nonempty if javacomp.sh will work.
ac_result="gcj -C"
else
if test -n "$HAVE_JAVAC_IN_PATH" \
- && (javac -version >/dev/null 2>/dev/null || test $? -le 2); then
+ && (javac -version >/dev/null 2>/dev/null || test $? -le 2) \
+ && (if javac -help 2>&1 >/dev/null | grep at.dms.kjc.Main >/dev/null && javac -help 2>/dev/null | grep 'released.*2000' >/dev/null ; then exit 1; else exit 0; fi); then
HAVE_JAVAC=1
ac_result="javac"
else
}
EOF
unset JAVA_HOME
- jikes conftest.java
+ jikes conftest.java 2>/dev/null
error=$?
rm -f conftest.java conftest.class
- exit $?
+ exit $error
); then
HAVE_JIKES=1
ac_result="jikes"
AC_SUBST(HAVE_JIKES)
])
-#serial 1
+# javaexec.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites of javaexec.sh.
# Sets HAVE_JAVAEXEC to nonempty if javaexec.sh will work.
AC_SUBST(HAVE_JVIEW)
])
-#serial 1
+# isc-posix.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
# This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package)
# PIC (with -KPIC) is the default.
;;
+ linux*)
+ echo '__INTEL_COMPILER' > conftest.$ac_ext
+ if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
+ then
+ lt_cv_prog_cc_can_build_shared=no
+ else
+ # Intel icc
+ lt_cv_prog_cc_pic='-KPIC'
+ lt_cv_prog_cc_static='-static'
+ lt_cv_prog_cc_wl='-Qoption,ld,'
+ fi
+ ;;
+
cygwin* | mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
allow_undefined_flag=$save_allow_undefined_flag
else
cat conftest.err 1>&5
- fi])
+ fi
+ $rm conftest*
+ ])
AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
;;
esac
# This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])
-dnl serial 1
+# stdbool.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether <stdbool.h> is supported or must be substituted.
AC_SUBST(STDBOOL_H)
])
-#serial 1
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
fi
])
-#serial 4
+# c-bs-a.m4 serial 4 (fileutils-4.1.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
fi
])
-#serial 2
+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
fi
])
-#serial 6
+# uintmax_t.m4 serial 6 (gettext-0.11)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
fi
])
-#serial 3
+# inttypes_h.m4 serial 3 (gettext-0.10.40)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
fi
])
-#serial 1
+# stdint_h.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
fi
])
-# serial 1
+# ssize_t.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
dnl Test whether ssize_t is defined.
fi
])
-#serial 4
+# getline.m4 serial 5 (gettext-0.11)
+dnl Copyright (C) 1998-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
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
[echo fooN |tr -d '\012'|tr N '\012' > conftest.data
AC_TRY_RUN([
# include <stdio.h>
-# include <sys/types.h>
+# include <stdlib.h>
# include <string.h>
int main ()
{ /* Based on a test program from Karl Heuer. */
fi
if test $am_cv_func_working_getline = no; then
+ dnl We must choose a different name for our function, since on ELF systems
+ dnl a broken getline() in libc.so would override our getline() in
+ dnl libgettextlib.so.
+ AC_DEFINE([getline], [gnu_getline],
+ [Define to a replacement function name for getline().])
LIBOBJS="$LIBOBJS getline.${ac_objext}"
AC_SUBST(LIBOBJS)
fi
])
-#serial 6
+# fnmatch.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Determine whether the system has a working fnmatch() function.
+AC_DEFUN([gt_FUNC_FNMATCH],
+[
+ dnl Don't use AC_FUNC_FNMATCH. In autoconf-2.52 the test is buggy and
+ dnl excludes all non-GNU implementations.
+ dnl Some versions of Solaris or SCO have a broken fnmatch function.
+ dnl So we run a test program. If we are cross-compiling, take no chance.
+ dnl Thanks to John Oleynick and Franc,ois Pinard for this test.
+ AC_CACHE_CHECK([for working fnmatch function], gt_cv_func_fnmatch_works, [
+ AC_TRY_RUN([
+# include <stdlib.h>
+# include <fnmatch.h>
+ int main ()
+ {
+ exit (fnmatch ("a*", "abc", 0) != 0
+ || fnmatch ("d*/*1", "d/s/1", FNM_PATHNAME) != FNM_NOMATCH);
+ }
+ ],
+ gt_cv_func_fnmatch_works=yes, gt_cv_func_fnmatch_works=no,
+ gt_cv_func_fnmatch_works=no dnl cross-compiling
+ )
+ ])
+ if test $gt_cv_func_fnmatch_works = yes; then
+ AC_DEFINE([HAVE_FNMATCH], 1,
+ [Define if you have <fnmatch.h> and a working fnmatch() function.])
+ fi
+
+ dnl Now some other actions, not part of AC_FUNC_FNMATCH.
+ if test $gt_cv_func_fnmatch_works = yes; then
+ rm -f lib/fnmatch.h
+ else
+ echo '#include "pfnmatch.h"' > lib/fnmatch.h
+ dnl We must choose a different name for our function, since on ELF systems
+ dnl a broken fnmatch() in libc.so would override our fnmatch() in
+ dnl libgettextlib.so.
+ AC_DEFINE([fnmatch], [posix_fnmatch],
+ [Define to a replacement function name for fnmatch().])
+ LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}"
+ AC_SUBST(LIBOBJS)
+ fi
+])
+
+# mbswidth.m4 serial 6 (fileutils-4.1.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl autoconf tests required for use of mbswidth.c
dnl From Bruno Haible.
AC_MBSTATE_T
])
-#serial 4
+# mbrtowc.m4 serial 4 (fileutils-4.1.3)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert
fi
])
-# serial 9
+# mbstate_t.m4 serial 9 (fileutils-4.1.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# From Paul Eggert.
[Define to a type if <wchar.h> does not define.])
fi])
-#serial 1
+# backupfile.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites of lib/backupfile.h
AC_CHECK_HEADERS(limits.h string.h unistd.h)
])
+# unionwait.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1993-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
dnl Taken from GNU make 3.79.1.
AC_DEFUN([gt_UNION_WAIT],
AC_MSG_RESULT($gt_cv_union_wait)
])
-#serial 1
+# tmpdir.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites for lib/tmpdir.c
AC_CHECK_FUNCS(__secure_getenv)
])
-#serial 1
+# mkdtemp.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites of lib/mkdtemp.c
AC_CHECK_FUNCS(gettimeofday)
])
-#serial 1
+# signalblocking.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Determine available signal blocking primitives. Three different APIs exist:
# 1) POSIX: sigemptyset, sigaddset, sigprocmask
fi
])
-#serial 1
+# siginfo.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Determine how to determine the precise cause of a signal, for example
# division by zero.
fi
])
-#serial 1
+# setenv.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Check if a variable is properly declared.
# gt_CHECK_VAR_DECL(includes,variable)
gt_CHECK_VAR_DECL([#include <unistd.h>], environ)
])
-# From Jim Meyering. Use this if you use the GNU error.[ch].
-# FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
- am_cv_lib_error_at_line=yes,
- am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.$ac_objext"
- fi
- AC_SUBST(LIBOBJS)dnl
+# error.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+# A modified version of AM_FUNC_ERROR_AT_LINE that triggers HAVE_ERROR_AT_LINE
+# in config.h instead of modifying LIBOBJS.
+AC_DEFUN([gt_FUNC_ERROR_AT_LINE],
+[
+ AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
+ [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
+ am_cv_lib_error_at_line=yes,
+ am_cv_lib_error_at_line=no)])
+ if test $am_cv_lib_error_at_line = yes; then
+ AC_DEFINE(HAVE_ERROR_AT_LINE, 1,
+ [Define to 1 if you have the functions error() and error_at_line().])
+ fi
])
-#serial 2
+# setlocale.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Check for setlocale declaration.
[Define as const if the declaration of setlocale() needs const.])
])
-#serial 1
+# hostname.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Prerequisites of the hostname.c program.
-AC_DEFUN(gt_PREREQ_HOSTNAME,
+AC_DEFUN([gt_PREREQ_HOSTNAME],
[
AC_CHECK_HEADERS(arpa/inet.h)
AC_CHECK_FUNCS(gethostname gethostbyname inet_ntop)
fi
])
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-# Bruno Haible <haible@clisp.cons.org>, 2000-2001.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
-
-# serial 11
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+# gettext.m4 serial 12 (gettext-0.11)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
dnl default (if it is not specified or empty) is 'no-libtool'.
dnl INTLSYMBOL should be 'external' for packages with no intl directory,
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function
dnl will be ignored.
-dnl LIBDIR is used to find the intl libraries. If empty,
+dnl INTLDIR is used to find the intl libraries. If empty,
dnl the value `$(top_builddir)/intl/' is used.
dnl
dnl The result of the configuration is one of three cases:
define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
- AC_REQUIRE([AM_WITH_LIBINTL])dnl
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
AC_REQUIRE([AM_INTL_SUBDIR])dnl
])
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
AC_ARG_ENABLE(nls,
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
])
- INTLLIBS=
+ LIBINTL=
+ LTLIBINTL=
POSUB=
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
- AC_DEFINE(ENABLE_NLS, 1,
- [Define to 1 if translation of program messages to the user's native language
- is requested.])
gt_use_preinstalled_gnugettext=no
ifelse(gt_included_intl, yes, [
AC_MSG_CHECKING([whether included gettext is requested])
dnl to fall back to GNU NLS library.
dnl Add a version number to the cache macros.
- define(gt_api_version, ifelse([$2], [need-ngettext], 2, 1))
- define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]gt_api_version[_libc])
- define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]gt_api_version[_libintl])
+ define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+ [AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+ [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+ gt_cv_func_gnugettext_libc=yes,
+ gt_cv_func_gnugettext_libc=no)])
- AC_CHECK_HEADER(libintl.h,
- [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
- [AC_TRY_LINK([#include <libintl.h>
+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
+ ifelse(gt_included_intl, yes, , [
+ AM_ICONV_LINK
+ ])
+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+ dnl even if libiconv doesn't exist.
+ AC_LIB_LINKFLAGS_BODY([intl])
+ AC_CACHE_CHECK([for GNU gettext in libintl],
+ gt_cv_func_gnugettext_libintl,
+ [gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ dnl Now see whether libintl exists and does not depend on libiconv.
+ AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr;],
[bindtextdomain ("", "");
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
- gt_cv_func_gnugettext_libc=yes,
- gt_cv_func_gnugettext_libc=no)])
-
- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
- ifelse(gt_included_intl, yes, , [
- AM_ICONV
- ])
- AC_CACHE_CHECK([for GNU gettext in libintl],
- gt_cv_func_gnugettext_libintl,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $LIBICONV"
+ gt_cv_func_gnugettext_libintl=yes,
+ gt_cv_func_gnugettext_libintl=no)
+ dnl Now see whether libintl exists and depends on libiconv.
+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr;],
[bindtextdomain ("", "");
return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
- gt_cv_func_gnugettext_libintl=yes,
- gt_cv_func_gnugettext_libintl=no)
- LIBS="$gt_save_LIBS"])
- fi
+ [LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ gt_cv_func_gnugettext_libintl=yes
+ ])
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"])
+ fi
- dnl If an already present or preinstalled GNU gettext() is found,
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if test "$gt_cv_func_gnugettext_libc" = "yes" \
- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
- && test "$PACKAGE" != gettext; }; then
- gt_use_preinstalled_gnugettext=yes
- fi
- ])
+ dnl If an already present or preinstalled GNU gettext() is found,
+ dnl use it. But if this macro is used in GNU gettext, and GNU
+ dnl gettext is already preinstalled in libintl, we update this
+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
+ if test "$gt_cv_func_gnugettext_libc" = "yes" \
+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+ && test "$PACKAGE" != gettext; }; then
+ gt_use_preinstalled_gnugettext=yes
+ fi
ifelse(gt_included_intl, yes, [
if test "$gt_use_preinstalled_gnugettext" != "yes"; then
INTLOBJS="\$(GETTOBJS)"
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
- INTLLIBS="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
fi
])
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [Define to 1 if translation of program messages to the user's native language
+ is requested.])
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
- dnl If iconv() is in a separate libiconv library, then anyone
- dnl linking with libintl{.a,.so} also needs to link with libiconv.
- INTLLIBS="-lintl $LIBICONV"
+ AC_MSG_CHECKING([how to link with libintl])
+ AC_MSG_RESULT([$LIBINTL])
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
fi
dnl For backward compatibility. Some packages may be using this.
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
])
- dnl Make all documented variables known to autoconf.
+ dnl For backward compatibility. Some Makefiles may be using this.
+ INTLLIBS="$LIBINTL"
AC_SUBST(INTLLIBS)
- AC_SUBST(POSUB)
-])
-
-AC_DEFUN([AM_WITH_LIBINTL],
-[
- AC_ARG_WITH([libintl-prefix],
-[ --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib], [
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
- ])
+ dnl Make all documented variables known to autoconf.
+ AC_SUBST(LIBINTL)
+ AC_SUBST(LTLIBINTL)
+ AC_SUBST(POSUB)
])
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+dnl Checks for all prerequisites of the po subdirectory,
+dnl except for USE_NLS.
AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
dnl because they are needed for "make dist" to work.
dnl Search for GNU msgfmt in the PATH.
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+ dnl The second test excludes FreeBSD msgfmt.
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- dnl Search for GNU xgettext in the PATH.
+ dnl Search for GNU xgettext 0.11 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+ dnl The second test excludes FreeBSD xgettext.
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
if test "$GMSGFMT" != ":"; then
dnl If it is no GNU msgfmt we define it as : so that the
dnl Makefiles still can work.
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
AC_MSG_RESULT(
- [found msgfmt program is not GNU msgfmt; ignore it])
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
GMSGFMT=":"
fi
fi
if test "$XGETTEXT" != ":"; then
dnl If it is no GNU xgettext we define it as : so that the
dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
AC_MSG_RESULT(
[found xgettext program is not GNU xgettext; ignore it])
XGETTEXT=":"
fi
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
fi
AC_OUTPUT_COMMANDS([
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
# ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
# on $ac_dir but don't depend on user-specified configuration
# parameters.
done
fi
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_dir"/Rules-*; do
- cat "$f" >> "$ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
done
fi
;;
])
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR],
[
AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_SUBST(MKINSTALLDIRS)
])
-#serial AM2
+# lib-prefix.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
-AC_DEFUN([AM_ICONV],
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+
+# lib-link.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ define([Name],[translit([$1],[./-], [___])])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed lib[]Name and not disabled its use
+ dnl via --without-lib[]Name-prefix, he wants to use it.
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIB[]NAME"
+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+ HAVE_LIB[]NAME=no
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+ dnl $INC[]NAME either.
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ undefine([Name])
+ undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L,
+dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+AC_DEFUN([AC_LIB_RPATH],
+[
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_ARG_WITH([lib$1-prefix],
+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+])
+ dnl Search the library and its dependencies in $additional_libdir and
+ dnl $LDFLAGS. Using breadth-first-seach.
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='$1 $2'
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+ else
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+ dnl that this library doesn't exist. So just drop it.
+ :
+ fi
+ else
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+ else
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+ fi
+ fi
+ dnl Assume the include files are nearby.
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ dnl Potentially add $additional_includedir to $INCNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
+ dnl constructed $INCNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $INCNAME.
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ dnl Look for dependencies.
+ if test -n "$found_la"; then
+ dnl Read the .la file. It defines the variables
+ dnl dlname, library_names, old_library, dependency_libs, current,
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ dnl We use only dependency_libs.
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LIBNAME.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -l*)
+ dnl Handle this in the next round.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ dnl Handle this in the next round. Throw away the .la's
+ dnl directory; it is already contained in a preceding -L
+ dnl option.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ dnl Most likely an immediate library name.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ dnl Didn't find the library; assume it is in the system directories
+ dnl known to the linker and runtime loader. (All the system
+ dnl directories known to the linker should also be known to the
+ dnl runtime loader, otherwise the system is severely misconfigured.)
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user must
+ dnl pass all path elements in one option. We can arrange that for a
+ dnl single library, but not when more than one $LIBNAMEs are used.
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+ for element in [$2]; do
+ haveit=
+ for x in $[$1]; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ [$1]="${[$1]}${[$1]:+ }$element"
+ fi
+ done
+])
+
+# lib-ld.m4 serial 1 (gettext-0.11)
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]* | [A-Za-z]:[\\/]*)]
+ [re_direlt='/[^/][^/]*/\.\./']
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
+
+# iconv.m4 serial AM3 (gettext-0.11)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINK],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
- AC_ARG_WITH([libiconv-prefix],
-[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
- ])
+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+
+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([iconv])
+
+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed libiconv and not disabled its use
+ dnl via --without-libiconv-prefix, he wants to use it. The first
+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+ am_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
+ LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ AC_MSG_CHECKING([how to link with libiconv])
+ AC_MSG_RESULT([$LIBICONV])
+ else
+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+ dnl either.
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+ AC_SUBST(LIBICONV)
+ AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+ AC_REQUIRE([AM_ICONV_LINK])
+ if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration])
AC_CACHE_VAL(am_cv_proto_iconv, [
AC_TRY_COMPILE([
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
[Define as const if the declaration of iconv() needs const.])
fi
- LIBICONV=
- if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
- fi
- AC_SUBST(LIBICONV)
])
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
+# progtest.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-# serial 2
+# Search path for a program which passes the given test.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
AC_SUBST($1)dnl
])
-#serial 2
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
# Test for the GNU C Library, version 2.1 or newer.
# From Bruno Haible.
]
)
-#serial AM1
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
fi
])
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
+# lcmessage.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
-# serial 2
+# Check whether LC_MESSAGES is available in <locale.h>.
AC_DEFUN([AM_LC_MESSAGES],
[if test $ac_cv_header_locale_h = yes; then
/* Define as a signed type of the same size as size_t. */
#undef ssize_t
+/* Define to a replacement function name for getline(). */
+#undef getline
+
+/* Define if you have <fnmatch.h> and a working fnmatch() function. */
+#undef HAVE_FNMATCH
+
+/* Define to a replacement function name for fnmatch(). */
+#undef fnmatch
+
/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
#undef HAVE_MBRTOWC
/* Define if you have the declaration of environ. */
#undef HAVE_ENVIRON_DECL
+/* Define to 1 if you have the functions error() and error_at_line(). */
+#undef HAVE_ERROR_AT_LINE
+
/* Define as const if the declaration of setlocale() needs const. */
#undef SETLOCALE_CONST
it). It is used to wrap the msgid and msgstr strings, and also to
wrap the file position (#:) comments. */
#define PAGE_WIDTH 79
+
+/* Extra OS/2 (emx+gcc) defines. */
+#ifdef __EMX__
+# include "intl/os2compat.h"
+#endif
ac_help="$ac_help
--with-pic try to use only PIC/non-PIC objects [default=use both]"
ac_help="$ac_help
- --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib"
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
ac_help="$ac_help
- --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib"
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir"
ac_help="$ac_help
--disable-nls do not use Native Language Support"
ac_help="$ac_help
--with-included-gettext use the GNU gettext library included here"
+ac_help="$ac_help
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir"
ac_help="$ac_help
--with-lispdir Override the default lisp directory "
ac_n= ac_c='\c' ac_t=
fi
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+echo "configure:723: checking for ld used by GCC" >&5
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:753: checking for GNU ld" >&5
+else
+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:756: checking for non-GNU ld" >&5
+fi
+if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$ac_t""$LD" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+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:791: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi
+fi
+
+echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
# 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:743: checking for a BSD compatible install" >&5
+echo "configure:843: 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
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:796: checking whether build environment is sane" >&5
+echo "configure:896: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftest.file
# 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:867: checking for $ac_word" >&5
+echo "configure:967: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
done
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:997: 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
# Define the identity of the package.
PACKAGE=gettext
-VERSION=0.11-pre2
+VERSION=0.11
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-RELEASE_DATE=2001-05-23
+RELEASE_DATE=2002-01-31
# 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:1020: checking for $ac_word" >&5
+echo "configure:1120: 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
# 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:1050: checking for $ac_word" >&5
+echo "configure:1150: 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
# 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:1101: checking for $ac_word" >&5
+echo "configure:1201: 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
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1133: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1233: 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.
cat > conftest.$ac_ext << EOF
-#line 1144 "configure"
+#line 1244 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1249: \"$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
{ 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:1175: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1275: 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:1180: checking whether we are using GNU C" >&5
+echo "configure:1280: 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
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1189: \"$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:1289: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1208: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1308: 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
END
# If we don't find an include directive, just comment out the code.
echo $ac_n "checking for style of include used by $am_make""... $ac_c" 1>&6
-echo "configure:1247: checking for style of include used by $am_make" >&5
+echo "configure:1347: checking for style of include used by $am_make" >&5
am__include='#'
am__quote=
_am_result=none
depcc="$CC" am_compiler_list=
echo $ac_n "checking dependency style of $depcc""... $ac_c" 1>&6
-echo "configure:1281: checking dependency style of $depcc" >&5
+echo "configure:1381: checking dependency style of $depcc" >&5
if eval "test \"`echo '$''{'am_cv_CC_dependencies_compiler_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:1359: checking for a BSD compatible install" >&5
+echo "configure:1459: 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
# 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:1416: checking for $ac_word" >&5
+echo "configure:1516: 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
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1450: checking for $ac_word" >&5
+echo "configure:1550: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1484: checking how to run the C preprocessor" >&5
+echo "configure:1584: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1499 "configure"
+#line 1599 "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:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1605: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1516 "configure"
+#line 1616 "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:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1622: \"$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*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1533 "configure"
+#line 1633 "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:1539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1639: \"$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
:
echo $ac_n "checking for Java compiler""... $ac_c" 1>&6
-echo "configure:1565: checking for Java compiler" >&5
+echo "configure:1665: checking for Java compiler" >&5
cat > conftest.$ac_ext <<EOF
-#line 1567 "configure"
+#line 1667 "configure"
#include "confdefs.h"
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
ac_result="gcj -C"
else
if test -n "$HAVE_JAVAC_IN_PATH" \
- && (javac -version >/dev/null 2>/dev/null || test $? -le 2); then
+ && (javac -version >/dev/null 2>/dev/null || test $? -le 2) \
+ && (if javac -help 2>&1 >/dev/null | grep at.dms.kjc.Main >/dev/null && javac -help 2>/dev/null | grep 'released.*2000' >/dev/null ; then exit 1; else exit 0; fi); then
HAVE_JAVAC=1
ac_result="javac"
else
}
EOF
unset JAVA_HOME
- jikes conftest.java
+ jikes conftest.java 2>/dev/null
error=$?
rm -f conftest.java conftest.class
- exit $?
+ exit $error
); then
HAVE_JIKES=1
ac_result="jikes"
# Extract the first word of "jar", so it can be a program name with args.
set dummy jar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1719: checking for $ac_word" >&5
+echo "configure:1820: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_JAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for Java virtual machine""... $ac_c" 1>&6
-echo "configure:1754: checking for Java virtual machine" >&5
+echo "configure:1855: checking for Java virtual machine" >&5
cat > conftest.$ac_ext <<EOF
-#line 1756 "configure"
+#line 1857 "configure"
#include "confdefs.h"
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1940: checking host system type" >&5
+echo "configure:2041: checking host system type" >&5
host_alias=$host
case "$host_alias" in
echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1963: checking for strerror in -lcposix" >&5
+echo "configure:2064: 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
ac_save_LIBS="$LIBS"
LIBS="-lcposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1971 "configure"
+#line 2072 "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
strerror()
; return 0; }
EOF
-if { (eval echo configure:1982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2083: \"$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
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2006: checking for object suffix" >&5
+echo "configure:2107: 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:2012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
for ac_file in conftest.*; do
case $ac_file in
*.c) ;;
ac_objext=$ac_cv_objext
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2030: checking for Cygwin environment" >&5
+echo "configure:2131: 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 2035 "configure"
+#line 2136 "configure"
#include "confdefs.h"
int main() {
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:2046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2063: checking for mingw32 environment" >&5
+echo "configure:2164: 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 2068 "configure"
+#line 2169 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:2075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2094: checking for executable suffix" >&5
+echo "configure:2195: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
fi
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:2195: checking build system type" >&5
+echo "configure:2296: checking build system type" >&5
build_alias=$build
case "$build_alias" in
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2224: checking for ld used by GCC" >&5
+echo "configure:2325: checking for ld used by GCC" >&5
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2254: checking for GNU ld" >&5
+echo "configure:2355: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2257: checking for non-GNU ld" >&5
+echo "configure:2358: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
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:2292: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:2393: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2309: checking for $LD option to reload object files" >&5
+echo "configure:2410: checking for $LD option to reload object files" >&5
if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
test -n "$reload_flag" && reload_flag=" $reload_flag"
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2321: checking for BSD-compatible nm" >&5
+echo "configure:2422: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2359: checking whether ln -s works" >&5
+echo "configure:2460: 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
fi
echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2380: checking how to recognise dependant libraries" >&5
+echo "configure:2481: checking how to recognise dependant libraries" >&5
if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:2563: checking command to parse $NM output" >&5
+echo "configure:2664: checking command to parse $NM output" >&5
if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
int main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:2740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { (eval echo configure:2642: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
+ if { (eval echo configure:2743: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
pipe_works=yes
fi
LIBS="$save_LIBS"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2739: checking for $ac_hdr" >&5
+echo "configure:2840: 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 2744 "configure"
+#line 2845 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2850: \"$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*
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2784: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2885: checking for ${ac_tool_prefix}file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2846: checking for file" >&5
+echo "configure:2947: checking for file" >&5
if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2917: checking for $ac_word" >&5
+echo "configure:3018: 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
# 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:2949: checking for $ac_word" >&5
+echo "configure:3050: 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
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2984: checking for $ac_word" >&5
+echo "configure:3085: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3016: checking for $ac_word" >&5
+echo "configure:3117: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3065 "configure"' > conftest.$ac_ext
- if { (eval echo configure:3066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 3166 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:3167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -32"
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:3087: checking whether the C compiler needs -belf" >&5
+echo "configure:3188: 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
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 3100 "configure"
+#line 3201 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3208: \"$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
compiler="$2"
echo $ac_n "checking for objdir""... $ac_c" 1>&6
-echo "configure:3220: checking for objdir" >&5
+echo "configure:3321: checking for objdir" >&5
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
# in isolation, and that seeing it set (from the cache) indicates that
# the associated values are set (in the cache) correctly too.
echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-echo "configure:3247: checking for $compiler option to produce PIC" >&5
+echo "configure:3348: checking for $compiler option to produce PIC" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# PIC (with -KPIC) is the default.
;;
+ linux*)
+ echo '__INTEL_COMPILER' > conftest.$ac_ext
+ if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
+ then
+ lt_cv_prog_cc_can_build_shared=no
+ else
+ # Intel icc
+ lt_cv_prog_cc_pic='-KPIC'
+ lt_cv_prog_cc_static='-static'
+ lt_cv_prog_cc_wl='-Qoption,ld,'
+ fi
+ ;;
+
cygwin* | mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Check to make sure the pic_flag actually works.
echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-echo "configure:3399: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo "configure:3513: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 3406 "configure"
+#line 3520 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
case $host_os in
hpux9* | hpux10* | hpux11*)
fi
echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-echo "configure:3465: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "configure:3579: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
cat > conftest.$ac_ext <<EOF
-#line 3473 "configure"
+#line 3587 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_prog_cc_static_works=yes
else
# Check to see if options -o and -c are simultaneously supported by compiler
echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-echo "configure:3507: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "configure:3621: checking if $compiler supports -c -o file.$ac_objext" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:3526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:3640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
if test x"$compiler_c_o" = x"yes"; then
# Check to see if we can write to a .lo
echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-echo "configure:3555: checking if $compiler supports -c -o file.lo" >&5
+echo "configure:3669: checking if $compiler supports -c -o file.lo" >&5
if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -c -o conftest.lo"
cat > conftest.$ac_ext <<EOF
-#line 3564 "configure"
+#line 3678 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test "$compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-echo "configure:3601: checking if we can lock with hard links" >&5
+echo "configure:3715: checking if we can lock with hard links" >&5
hard_links=yes
$rm conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
if test "$GCC" = yes; then
# Check to see if options -fno-rtti -fno-exceptions are supported by compiler
echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-echo "configure:3620: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo "configure:3734: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo "int some_variable = 0;" > conftest.$ac_ext
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
compiler_rtti_exceptions=no
cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
+#line 3740 "configure"
#include "confdefs.h"
int main() {
int some_variable = 0;
; return 0; }
EOF
-if { (eval echo configure:3633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-echo "configure:3660: checking whether the linker ($LD) supports shared libraries" >&5
+echo "configure:3774: checking whether the linker ($LD) supports shared libraries" >&5
allow_undefined_flag=
no_undefined_flag=
# Check hardcoding attributes.
echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-echo "configure:4276: checking how to hardcode library paths into programs" >&5
+echo "configure:4390: checking how to hardcode library paths into programs" >&5
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var"; then
striplib=
old_striplib=
echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-echo "configure:4304: checking whether stripping libraries is possible" >&5
+echo "configure:4418: checking whether stripping libraries is possible" >&5
if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
# PORTME Fill in your ld.so characteristics
echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-echo "configure:4318: checking dynamic linker characteristics" >&5
+echo "configure:4432: checking dynamic linker characteristics" >&5
library_names_spec=
libname_spec='lib$name'
soname_spec=
# Report the final consequences.
echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-echo "configure:4704: checking if libtool supports shared libraries" >&5
+echo "configure:4818: checking if libtool supports shared libraries" >&5
echo "$ac_t""$can_build_shared" 1>&6
if test "$hardcode_action" = relink; then
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4743: checking for dlopen in -ldl" >&5
+echo "configure:4857: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4751 "configure"
+#line 4865 "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
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4876: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4781: checking for dlopen" >&5
+echo "configure:4895: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4786 "configure"
+#line 4900 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
; return 0; }
EOF
-if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "configure:4827: checking for shl_load" >&5
+echo "configure:4941: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4832 "configure"
+#line 4946 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
; return 0; }
EOF
-if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:4873: checking for dlopen in -lsvld" >&5
+echo "configure:4987: checking for dlopen in -lsvld" >&5
ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsvld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4881 "configure"
+#line 4995 "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
dlopen()
; return 0; }
EOF
-if { (eval echo configure:4892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5006: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:4911: checking for shl_load in -ldld" >&5
+echo "configure:5025: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4919 "configure"
+#line 5033 "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
shl_load()
; return 0; }
EOF
-if { (eval echo configure:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5044: \"$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
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "configure:4983: checking whether a program can dlopen itself" >&5
+echo "configure:5097: checking whether a program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 4993 "configure"
+#line 5107 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
exit (status);
}
EOF
- if { (eval echo configure:5054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
if test "x$lt_cv_dlopen_self" = xyes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-echo "configure:5077: checking whether a statically linked program can dlopen itself" >&5
+echo "configure:5191: checking whether a statically linked program can dlopen itself" >&5
if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 5087 "configure"
+#line 5201 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
exit (status);
}
EOF
- if { (eval echo configure:5148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ if { (eval echo configure:5262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) 2>/dev/null
lt_status=$?
case x$lt_status in
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-echo "configure:5197: checking whether -lc should be explicitly linked in" >&5
+echo "configure:5311: checking whether -lc should be explicitly linked in" >&5
if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
$rm conftest*
echo 'static int dummy;' > conftest.$ac_ext
- if { (eval echo configure:5204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
libname=conftest
save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo configure:5217: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+ if { (eval echo configure:5331: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
then
lt_cv_archive_cmds_need_lc=no
else
else
cat conftest.err 1>&5
fi
+ $rm conftest*
+
fi
echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:5802: checking for ANSI C header files" >&5
+echo "configure:5918: 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 5807 "configure"
+#line 5923 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5931: \"$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*
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 5832 "configure"
+#line 5948 "configure"
#include "confdefs.h"
#include <string.h>
EOF
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 5850 "configure"
+#line 5966 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 5871 "configure"
+#line 5987 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5909: checking for $ac_hdr" >&5
+echo "configure:6025: 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 5914 "configure"
+#line 6030 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6035: \"$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*
done
echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6
-echo "configure:5946: checking for stdbool.h" >&5
+echo "configure:6062: checking for stdbool.h" >&5
if eval "test \"`echo '$''{'gt_cv_header_stdbool_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5952 "configure"
+#line 6068 "configure"
#include "confdefs.h"
#include <stdbool.h>
#if false
; return 0; }
EOF
-if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_header_stdbool_h=yes
else
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5995: checking for working const" >&5
+echo "configure:6111: 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 6000 "configure"
+#line 6116 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:6070: checking for inline" >&5
+echo "configure:6186: 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 6077 "configure"
+#line 6193 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:6084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
echo $ac_n "checking for signed""... $ac_c" 1>&6
-echo "configure:6111: checking for signed" >&5
+echo "configure:6227: 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 6116 "configure"
+#line 6232 "configure"
#include "confdefs.h"
int main() {
signed char x;
; return 0; }
EOF
-if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
bh_cv_c_signed=yes
else
echo $ac_n "checking whether backslash-a works in strings""... $ac_c" 1>&6
-echo "configure:6145: checking whether backslash-a works in strings" >&5
+echo "configure:6261: 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 6150 "configure"
+#line 6266 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_backslash_a=yes
else
echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
-echo "configure:6186: checking for unsigned long long" >&5
+echo "configure:6302: 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 6191 "configure"
+#line 6307 "configure"
#include "confdefs.h"
unsigned long long ull = 1; int i = 63;
int main() {
return ull << i | ull >> i | ullmax / ull | ullmax % ull;
; return 0; }
EOF
-if { (eval echo configure:6199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6315: \"$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
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6220: checking for off_t" >&5
+echo "configure:6336: 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 6225 "configure"
+#line 6341 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6253: checking for size_t" >&5
+echo "configure:6369: 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 6258 "configure"
+#line 6374 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
-echo "configure:6286: checking for ptrdiff_t" >&5
+echo "configure:6402: 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 6291 "configure"
+#line 6407 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
ptrdiff_t p
; return 0; }
EOF
-if { (eval echo configure:6298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_type_ptrdiff_t=yes
else
echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:6320: checking for inttypes.h" >&5
+echo "configure:6436: 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 6325 "configure"
+#line 6441 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <inttypes.h>
uintmax_t i = (uintmax_t) -1;
; return 0; }
EOF
-if { (eval echo configure:6333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
jm_ac_cv_header_inttypes_h=yes
else
echo $ac_n "checking for stdint.h""... $ac_c" 1>&6
-echo "configure:6355: checking for stdint.h" >&5
+echo "configure:6471: checking for stdint.h" >&5
if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6360 "configure"
+#line 6476 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <stdint.h>
uintmax_t i = (uintmax_t) -1;
; return 0; }
EOF
-if { (eval echo configure:6368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
jm_ac_cv_header_stdint_h=yes
else
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:6404: checking for ssize_t" >&5
+echo "configure:6520: checking for ssize_t" >&5
if eval "test \"`echo '$''{'gt_cv_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6409 "configure"
+#line 6525 "configure"
#include "confdefs.h"
#include <sys/types.h>
int x = sizeof (ssize_t *) + sizeof (ssize_t);
; return 0; }
EOF
-if { (eval echo configure:6420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_ssize_t=yes
else
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6441: checking for pid_t" >&5
+echo "configure:6557: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6446 "configure"
+#line 6562 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
# 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:6477: checking for working alloca.h" >&5
+echo "configure:6593: 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 6482 "configure"
+#line 6598 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:6489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6605: \"$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
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6510: checking for alloca" >&5
+echo "configure:6626: 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 6515 "configure"
+#line 6631 "configure"
#include "confdefs.h"
#ifdef __GNUC__
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6659: \"$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
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6575: checking whether alloca needs Cray hooks" >&5
+echo "configure:6691: 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 6580 "configure"
+#line 6696 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
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:6605: checking for $ac_func" >&5
+echo "configure:6721: 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 6610 "configure"
+#line 6726 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6749: \"$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
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:6660: checking stack direction for C alloca" >&5
+echo "configure:6776: 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
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 6668 "configure"
+#line 6784 "configure"
#include "confdefs.h"
find_stack_direction ()
{
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6803: \"$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
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:6709: checking for vprintf" >&5
+echo "configure:6825: 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 6714 "configure"
+#line 6830 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:6737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6853: \"$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
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:6761: checking for _doprnt" >&5
+echo "configure:6877: 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 6766 "configure"
+#line 6882 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:6789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6905: \"$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
fi
for ac_func in getcwd mblen memcpy posix_spawn putc_unlocked raise select \
-strerror uname utime utimes
+strerror strtoul uname utime utimes
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6817: checking for $ac_func" >&5
+echo "configure:6933: 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 6822 "configure"
+#line 6938 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6961: \"$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
done
for ac_func in memset stpcpy stpncpy strcspn \
-strcasecmp strncasecmp strpbrk strstr strtoul vasprintf
+strcasecmp strncasecmp strpbrk strstr vasprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6873: checking for $ac_func" >&5
+echo "configure:6989: 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 6878 "configure"
+#line 6994 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7017: \"$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
am_getline_needs_run_time_check=no
echo $ac_n "checking for getline""... $ac_c" 1>&6
-echo "configure:6929: checking for getline" >&5
+echo "configure:7045: 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 6934 "configure"
+#line 7050 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getline(); below. */
; return 0; }
EOF
-if { (eval echo configure:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7073: \"$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
if test $am_getline_needs_run_time_check = yes; then
echo $ac_n "checking for working getline function""... $ac_c" 1>&6
-echo "configure:6979: checking for working getline function" >&5
+echo "configure:7095: 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
am_cv_func_working_getline=no
else
cat > conftest.$ac_ext <<EOF
-#line 6988 "configure"
+#line 7104 "configure"
#include "confdefs.h"
# include <stdio.h>
-# include <sys/types.h>
+# include <stdlib.h>
# include <string.h>
int main ()
{ /* Based on a test program from Karl Heuer. */
}
EOF
-if { (eval echo configure:7007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7123: \"$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
fi
if test $am_cv_func_working_getline = no; then
+ cat >> confdefs.h <<\EOF
+#define getline gnu_getline
+EOF
+
LIBOBJS="$LIBOBJS getline.${ac_objext}"
fi
for ac_func in getdelim
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7033: checking for $ac_func" >&5
+echo "configure:7153: 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 7038 "configure"
+#line 7158 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:7061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7181: \"$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
fi
+ echo $ac_n "checking for working fnmatch function""... $ac_c" 1>&6
+echo "configure:7208: checking for working fnmatch function" >&5
+if eval "test \"`echo '$''{'gt_cv_func_fnmatch_works'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ if test "$cross_compiling" = yes; then
+ gt_cv_func_fnmatch_works=no
+else
+ cat > conftest.$ac_ext <<EOF
+#line 7217 "configure"
+#include "confdefs.h"
+
+# include <stdlib.h>
+# include <fnmatch.h>
+ int main ()
+ {
+ exit (fnmatch ("a*", "abc", 0) != 0
+ || fnmatch ("d*/*1", "d/s/1", FNM_PATHNAME) != FNM_NOMATCH);
+ }
+
+EOF
+if { (eval echo configure:7229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ gt_cv_func_fnmatch_works=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ gt_cv_func_fnmatch_works=no
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$gt_cv_func_fnmatch_works" 1>&6
+ if test $gt_cv_func_fnmatch_works = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_FNMATCH 1
+EOF
+
+ fi
+
+ if test $gt_cv_func_fnmatch_works = yes; then
+ rm -f lib/fnmatch.h
+ else
+ echo '#include "pfnmatch.h"' > lib/fnmatch.h
+ cat >> confdefs.h <<\EOF
+#define fnmatch posix_fnmatch
+EOF
+
+ LIBOBJS="$LIBOBJS pfnmatch.${ac_objext}"
+
+ fi
+
+
for ac_hdr in limits.h stdlib.h string.h wchar.h wctype.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7092: checking for $ac_hdr" >&5
+echo "configure:7270: 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 7097 "configure"
+#line 7275 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7280: \"$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*
for ac_func in isascii iswcntrl iswprint mbsinit wcwidth
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7131: checking for $ac_func" >&5
+echo "configure:7309: 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 7136 "configure"
+#line 7314 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7337: \"$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
echo $ac_n "checking whether mbrtowc and mbstate_t are properly declared""... $ac_c" 1>&6
-echo "configure:7185: checking whether mbrtowc and mbstate_t are properly declared" >&5
+echo "configure:7363: checking whether mbrtowc and mbstate_t are properly declared" >&5
if eval "test \"`echo '$''{'jm_cv_func_mbrtowc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7190 "configure"
+#line 7368 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
mbstate_t state; return ! (sizeof state && mbrtowc);
; return 0; }
EOF
-if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
jm_cv_func_mbrtowc=yes
else
echo $ac_n "checking whether wcwidth is declared""... $ac_c" 1>&6
-echo "configure:7219: checking whether wcwidth is declared" >&5
+echo "configure:7397: checking whether wcwidth is declared" >&5
if eval "test \"`echo '$''{'ac_cv_have_decl_wcwidth'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7224 "configure"
+#line 7402 "configure"
#include "confdefs.h"
/* AIX 3.2.5 declares wcwidth in <string.h>. */
; return 0; }
EOF
-if { (eval echo configure:7243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_have_decl_wcwidth=yes
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7271: checking for $ac_hdr" >&5
+echo "configure:7449: 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 7276 "configure"
+#line 7454 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7459: \"$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*
echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
-echo "configure:7309: checking for mbstate_t" >&5
+echo "configure:7487: checking for mbstate_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7314 "configure"
+#line 7492 "configure"
#include "confdefs.h"
#if HAVE_STDLIB_H
mbstate_t x; return sizeof x;
; return 0; }
EOF
-if { (eval echo configure:7325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_mbstate_t=yes
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:7350: checking for $ac_hdr that defines DIR" >&5
+echo "configure:7528: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7355 "configure"
+#line 7533 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:7363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:7388: checking for opendir in -ldir" >&5
+echo "configure:7566: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7396 "configure"
+#line 7574 "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
opendir()
; return 0; }
EOF
-if { (eval echo configure:7407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7585: \"$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
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:7429: checking for opendir in -lx" >&5
+echo "configure:7607: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7437 "configure"
+#line 7615 "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
opendir()
; return 0; }
EOF
-if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7626: \"$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
echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
-echo "configure:7473: checking whether closedir returns void" >&5
+echo "configure:7651: checking whether closedir returns void" >&5
if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_func_closedir_void=yes
else
cat > conftest.$ac_ext <<EOF
-#line 7481 "configure"
+#line 7659 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_header_dirent>
int closedir(); main() { exit(closedir(opendir(".")) != 0); }
EOF
-if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_closedir_void=no
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7513: checking for $ac_hdr" >&5
+echo "configure:7691: 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 7518 "configure"
+#line 7696 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7701: \"$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*
done
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:7550: checking for long file names" >&5
+echo "configure:7728: checking for long file names" >&5
if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_func in pathconf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7596: checking for $ac_func" >&5
+echo "configure:7774: 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 7601 "configure"
+#line 7779 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:7624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7802: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7652: checking for $ac_hdr" >&5
+echo "configure:7830: 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 7657 "configure"
+#line 7835 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7840: \"$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*
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7691: checking for vfork.h" >&5
+echo "configure:7869: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7696 "configure"
+#line 7874 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7879: \"$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*
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:7726: checking for working vfork" >&5
+echo "configure:7904: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:7732: checking for vfork" >&5
+echo "configure:7910: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7737 "configure"
+#line 7915 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
; return 0; }
EOF
-if { (eval echo configure:7760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 7782 "configure"
+#line 7960 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
}
}
EOF
-if { (eval echo configure:7877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
for ac_func in waitpid
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7903: checking for $ac_func" >&5
+echo "configure:8081: 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 7908 "configure"
+#line 8086 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:7931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8109: \"$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
done
echo $ac_n "checking for union wait""... $ac_c" 1>&6
-echo "configure:7956: checking for union wait" >&5
+echo "configure:8134: checking for union wait" >&5
if eval "test \"`echo '$''{'gt_cv_union_wait'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7961 "configure"
+#line 8139 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
; return 0; }
EOF
-if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
gt_cv_union_wait=yes
else
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:8006: checking whether stat file-mode macros are broken" >&5
+echo "configure:8184: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8011 "configure"
+#line 8189 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
for ac_func in __secure_getenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8064: checking for $ac_func" >&5
+echo "configure:8242: 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 8069 "configure"
+#line 8247 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8270: \"$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
for ac_func in mkdtemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8121: checking for $ac_func" >&5
+echo "configure:8299: 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 8126 "configure"
+#line 8304 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8327: \"$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
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:8176: checking whether stat file-mode macros are broken" >&5
+echo "configure:8354: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8181 "configure"
+#line 8359 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:8233: checking for inttypes.h" >&5
+echo "configure:8411: 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 8238 "configure"
+#line 8416 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <inttypes.h>
uintmax_t i = (uintmax_t) -1;
; return 0; }
EOF
-if { (eval echo configure:8246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
jm_ac_cv_header_inttypes_h=yes
else
echo $ac_n "checking for stdint.h""... $ac_c" 1>&6
-echo "configure:8268: checking for stdint.h" >&5
+echo "configure:8446: checking for stdint.h" >&5
if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8273 "configure"
+#line 8451 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <stdint.h>
uintmax_t i = (uintmax_t) -1;
; return 0; }
EOF
-if { (eval echo configure:8281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
jm_ac_cv_header_stdint_h=yes
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8305: checking for $ac_hdr" >&5
+echo "configure:8483: 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 8310 "configure"
+#line 8488 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8493: \"$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*
for ac_func in gettimeofday
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8344: checking for $ac_func" >&5
+echo "configure:8522: 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 8349 "configure"
+#line 8527 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8550: \"$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
signals_not_posix=
cat > conftest.$ac_ext <<EOF
-#line 8400 "configure"
+#line 8578 "configure"
#include "confdefs.h"
#include <signal.h>
EOF
if test -z "$signals_not_posix"; then
echo $ac_n "checking for sigprocmask""... $ac_c" 1>&6
-echo "configure:8415: checking for sigprocmask" >&5
+echo "configure:8593: checking for sigprocmask" >&5
if eval "test \"`echo '$''{'ac_cv_func_sigprocmask'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8420 "configure"
+#line 8598 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigprocmask(); below. */
; return 0; }
EOF
-if { (eval echo configure:8443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sigprocmask=yes"
else
echo $ac_n "checking for signal handlers with siginfo_t""... $ac_c" 1>&6
-echo "configure:8469: checking for signal handlers with siginfo_t" >&5
+echo "configure:8647: checking for signal handlers with siginfo_t" >&5
if eval "test \"`echo '$''{'gt_cv_siginfo_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8474 "configure"
+#line 8652 "configure"
#include "confdefs.h"
#include <signal.h>
; return 0; }
EOF
-if { (eval echo configure:8487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_siginfo_t=yes
else
for ac_func in setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8511: checking for $ac_func" >&5
+echo "configure:8689: 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 8516 "configure"
+#line 8694 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8717: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8569: checking for $ac_hdr" >&5
+echo "configure:8747: 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 8574 "configure"
+#line 8752 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8757: \"$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*
for ac_func in tsearch
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8608: checking for $ac_func" >&5
+echo "configure:8786: 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 8613 "configure"
+#line 8791 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8814: \"$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
echo $ac_n "checking if errno is properly declared""... $ac_c" 1>&6
-echo "configure:8663: checking if errno is properly declared" >&5
+echo "configure:8841: checking if errno is properly declared" >&5
if eval "test \"`echo '$''{'gt_cv_var_errno_declaration'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8669 "configure"
+#line 8847 "configure"
#include "confdefs.h"
#include <errno.h>
extern struct { int foo; } errno;
errno.foo = 1;
; return 0; }
EOF
-if { (eval echo configure:8677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_var_errno_declaration=no
else
echo $ac_n "checking if environ is properly declared""... $ac_c" 1>&6
-echo "configure:8700: checking if environ is properly declared" >&5
+echo "configure:8878: checking if environ is properly declared" >&5
if eval "test \"`echo '$''{'gt_cv_var_environ_declaration'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8706 "configure"
+#line 8884 "configure"
#include "confdefs.h"
#include <unistd.h>
extern struct { int foo; } environ;
environ.foo = 1;
; return 0; }
EOF
-if { (eval echo configure:8714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_var_environ_declaration=no
else
-echo $ac_n "checking for error_at_line""... $ac_c" 1>&6
-echo "configure:8737: checking for error_at_line" >&5
+ echo $ac_n "checking for error_at_line""... $ac_c" 1>&6
+echo "configure:8915: 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 8742 "configure"
+#line 8920 "configure"
#include "confdefs.h"
int main() {
error_at_line(0, 0, "", 0, "");
; return 0; }
EOF
-if { (eval echo configure:8749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8927: \"$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
fi
echo "$ac_t""$am_cv_lib_error_at_line" 1>&6
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.$ac_objext"
- fi
-
+ if test $am_cv_lib_error_at_line = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_ERROR_AT_LINE 1
+EOF
+
+ fi
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:8772: checking for $ac_hdr" >&5
+echo "configure:8952: 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 8777 "configure"
+#line 8957 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8962: \"$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*
done
echo $ac_n "checking for setlocale declaration""... $ac_c" 1>&6
-echo "configure:8809: checking for setlocale declaration" >&5
+echo "configure:8989: 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 8815 "configure"
+#line 8995 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:8834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_proto_setlocale_arg1=""
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8861: checking for $ac_hdr" >&5
+echo "configure:9041: 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 8866 "configure"
+#line 9046 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9051: \"$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*
for ac_func in gethostname gethostbyname inet_ntop
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8900: checking for $ac_func" >&5
+echo "configure:9080: 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 8905 "configure"
+#line 9085 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9108: \"$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
echo $ac_n "checking for IPv6 sockets""... $ac_c" 1>&6
-echo "configure:8954: checking for IPv6 sockets" >&5
+echo "configure:9134: checking for IPv6 sockets" >&5
if eval "test \"`echo '$''{'gt_cv_socket_ipv6'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8960 "configure"
+#line 9140 "configure"
#include "confdefs.h"
#include <sys/types.h>
int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;
; return 0; }
EOF
-if { (eval echo configure:8970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
gt_cv_socket_ipv6=yes
else
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+
+ echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
+echo "configure:9190: checking for shared library run path origin" >&5
+if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+
+echo "$ac_t""$acl_cv_rpath" 1>&6
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+
+
MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
# 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:9005: checking for $ac_word" >&5
+echo "configure:9227: 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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9036: checking for $ac_hdr" >&5
+echo "configure:9258: 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 9041 "configure"
+#line 9263 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9268: \"$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*
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9075: checking for $ac_func" >&5
+echo "configure:9297: 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 9080 "configure"
+#line 9302 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:9103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9325: \"$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
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:9128: checking for working mmap" >&5
+echo "configure:9350: 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
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 9136 "configure"
+#line 9358 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
}
EOF
-if { (eval echo configure:9276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9498: \"$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
echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-echo "configure:9300: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "configure:9522: checking whether we are using the GNU C Library 2.1 or newer" >&5
if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9305 "configure"
+#line 9527 "configure"
#include "confdefs.h"
#include <features.h>
- # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
- withval="$with_libintl_prefix"
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+
+fi
+
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
done
-
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:9942: 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 GNU libiconv"
+ am_cv_lib_iconv=no
+ cat > conftest.$ac_ext <<EOF
+#line 9950 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ am_cv_func_iconv=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat > conftest.$ac_ext <<EOF
+#line 9972 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:9982: \"$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
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ LIBS="$am_save_LIBS"
+ fi
+
fi
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+ if test "$am_cv_func_iconv" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
+EOF
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6
+echo "configure:10005: checking how to link with libiconv" >&5
+ echo "$ac_t""$LIBICONV" 1>&6
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
- # Extract the first word of "msgfmt", so it can be a program name with args.
+ # 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:9354: checking for $ac_word" >&5
+echo "configure:10021: 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
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
+ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
ac_cv_path_MSGFMT="$ac_dir/$ac_word"
break
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:9388: checking for $ac_word" >&5
+echo "configure:10056: 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
fi
- # Extract the first word of "xgettext", so it can be a program name with args.
+ # 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:9425: checking for $ac_word" >&5
+echo "configure:10093: 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
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
+ if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
break
fi
echo "$ac_t""no" 1>&6
fi
+ rm -f messages.po
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9460: checking for $ac_word" >&5
+echo "configure:10130: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GMSGFMT" != ":"; then
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
- echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+ echo "$ac_t""found $GMSGFMT program is not GNU msgfmt; ignore it" 1>&6
GMSGFMT=":"
fi
fi
if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
: ;
else
echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
XGETTEXT=":"
fi
+ rm -f messages.po
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9519: checking for $ac_hdr" >&5
+echo "configure:10193: 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 9524 "configure"
+#line 10198 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10203: \"$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*
strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9560: checking for $ac_func" >&5
+echo "configure:10234: 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 9565 "configure"
+#line 10239 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:9588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10262: \"$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
-
- # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
- withval="$with_libiconv_prefix"
-
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
- done
-
-fi
-
-
- echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:9628: 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 GNU libiconv"
- am_cv_lib_iconv=no
- cat > conftest.$ac_ext <<EOF
-#line 9636 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <iconv.h>
-int main() {
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:9646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- am_cv_func_iconv=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- cat > conftest.$ac_ext <<EOF
-#line 9658 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <iconv.h>
-int main() {
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:9668: \"$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
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
- LIBS="$am_save_LIBS"
- fi
-fi
-
-echo "$ac_t""$am_cv_func_iconv" 1>&6
if test "$am_cv_func_iconv" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_ICONV 1
-EOF
-
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:9689: checking for iconv declaration" >&5
+echo "configure:10291: 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 9695 "configure"
+#line 10297 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:9714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_proto_iconv_arg1=""
else
EOF
fi
- LIBICONV=
- if test "$am_cv_lib_iconv" = yes; then
- LIBICONV="-liconv"
- fi
-
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:9743: checking for nl_langinfo and CODESET" >&5
+echo "configure:10340: 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 9748 "configure"
+#line 10345 "configure"
#include "confdefs.h"
#include <langinfo.h>
int main() {
char* cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:9755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_langinfo_codeset=yes
else
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:9778: checking for LC_MESSAGES" >&5
+echo "configure:10375: 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 9783 "configure"
+#line 10380 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:9790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10387: \"$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
# 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:9816: checking for $ac_word" >&5
+echo "configure:10413: 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
ac_verc_fail=yes
else
echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:9849: checking version of bison" >&5
+echo "configure:10446: 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;;
+
-
+
+
+
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:9873: checking whether NLS is requested" >&5
+echo "configure:10473: 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"
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
- INTLLIBS=
+ LIBINTL=
+ LTLIBINTL=
POSUB=
if test "$USE_NLS" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define ENABLE_NLS 1
-EOF
-
gt_use_preinstalled_gnugettext=no
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:9900: checking whether included gettext is requested" >&5
+echo "configure:10497: 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"
- ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:9921: checking for libintl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+echo "configure:10517: 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 9926 "configure"
+#line 10522 "configure"
#include "confdefs.h"
#include <libintl.h>
+extern int _nl_msg_cat_cntr;
+int main() {
+bindtextdomain ("", "");
+return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9931: \"$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
+if { (eval echo configure:10531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ gt_cv_func_gnugettext2_libc=yes
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+ gt_cv_func_gnugettext2_libc=no
fi
rm -f conftest*
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:9948: checking for GNU gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext2_libc'+set}'`\" = set"; then
+
+echo "$ac_t""$gt_cv_func_gnugettext2_libc" 1>&6
+
+ if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then
+ withval="$with_libintl_prefix"
+
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+
+fi
+
+ LIBINTL=
+ LTLIBINTL=
+ INCINTL=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='intl '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBINTL; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
+ done
+ fi
+
+ echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+echo "configure:10901: 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
- cat > conftest.$ac_ext <<EOF
-#line 9953 "configure"
+ gt_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $INCINTL"
+ gt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBINTL"
+ cat > conftest.$ac_ext <<EOF
+#line 10910 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:9962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- gt_cv_func_gnugettext2_libc=yes
+ gt_cv_func_gnugettext2_libintl=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- gt_cv_func_gnugettext2_libc=no
+ gt_cv_func_gnugettext2_libintl=no
fi
rm -f conftest*
-fi
-
-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:9979: 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 $LIBICONV"
+ if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then
+ LIBS="$LIBS $LIBICONV"
cat > conftest.$ac_ext <<EOF
-#line 9986 "configure"
+#line 10932 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
; return 0; }
EOF
-if { (eval echo configure:9995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- gt_cv_func_gnugettext2_libintl=yes
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ gt_cv_func_gnugettext2_libintl=yes
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_func_gnugettext2_libintl=no
fi
rm -f conftest*
- LIBS="$gt_save_LIBS"
+ fi
+ CPPFLAGS="$gt_save_CPPFLAGS"
+ LIBS="$gt_save_LIBS"
fi
echo "$ac_t""$gt_cv_func_gnugettext2_libintl" 1>&6
- fi
-
- if test "$gt_cv_func_gnugettext2_libc" = "yes" \
- || { test "$gt_cv_func_gnugettext2_libintl" = "yes" \
- && test "$PACKAGE" != gettext; }; then
- gt_use_preinstalled_gnugettext=yes
- fi
-
-else
- echo "$ac_t""no" 1>&6
-fi
+ fi
+ if test "$gt_cv_func_gnugettext2_libc" = "yes" \
+ || { test "$gt_cv_func_gnugettext2_libintl" = "yes" \
+ && test "$PACKAGE" != gettext; }; then
+ gt_use_preinstalled_gnugettext=yes
+ fi
if test "$gt_use_preinstalled_gnugettext" != "yes"; then
INTLOBJS="\$(GETTOBJS)"
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
- INTLLIBS="\${top_builddir}/intl/libintl.la $LIBICONV"
+ LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV"
+ LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
fi
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define ENABLE_NLS 1
+EOF
+
+ else
+ USE_NLS=no
+ fi
+ fi
+
+ if test "$USE_NLS" = "yes"; then
+
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
- INTLLIBS="-lintl $LIBICONV"
+ echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6
+echo "configure:11003: checking how to link with libintl" >&5
+ echo "$ac_t""$LIBINTL" 1>&6
+
+ for element in $INCINTL; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
fi
cat >> confdefs.h <<\EOF
+ INTLLIBS="$LIBINTL"
+
+
+
# Check whether --with-lispdir or --without-lispdir was given.
withval="$with_lispdir"
lispdir="$withval"
echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:10095: checking where .elc files should go" >&5
+echo "configure:11082: checking where .elc files should go" >&5
echo "$ac_t""$lispdir" 1>&6
else
# 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:10107: checking for $ac_word" >&5
+echo "configure:11094: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_EMACS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test $EMACS != "no"; then
if test x${lispdir+set} != xset; then
echo $ac_n "checking where .elc files should go""... $ac_c" 1>&6
-echo "configure:10140: checking where .elc files should go" >&5
+echo "configure:11127: checking where .elc files should go" >&5
if eval "test \"`echo '$''{'am_cv_lispdir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "dvips", so it can be a program name with args.
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10167: checking for $ac_word" >&5
+echo "configure:11154: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "texi2pdf", so it can be a program name with args.
set dummy texi2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10203: checking for $ac_word" >&5
+echo "configure:11190: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TEXI2PDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10239: checking for $ac_word" >&5
+echo "configure:11226: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:10281: checking for $ac_word" >&5
+echo "configure:11268: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
test -n "$CXX" || CXX=":"
if test "$CXX" != ":"; then
- echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:10313: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-ac_ext=C
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:11300: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
-cat > conftest.$ac_ext << EOF
+ cat > conftest.$ac_ext << EOF
-#line 10324 "configure"
+#line 11311 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
ac_cv_prog_cxx_works=no
fi
rm -fr conftest*
-ac_ext=c
+ ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
- { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+ if test $ac_cv_prog_cxx_works = no; then
+ CXX=:
+ fi
fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:10355: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-fi
+
+
+
test -d intl || mkdir intl
echo "GNU gettext library from $PACKAGE-$VERSION" > intl/VERSION
s%@MSGMERGE@%$MSGMERGE%g
s%@GLIBC21@%$GLIBC21%g
s%@LIBICONV@%$LIBICONV%g
+s%@LTLIBICONV@%$LTLIBICONV%g
s%@INTLBISON@%$INTLBISON%g
s%@USE_NLS@%$USE_NLS%g
s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
s%@GENCAT@%$GENCAT%g
s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
s%@INTLLIBS@%$INTLLIBS%g
+s%@LIBINTL@%$LIBINTL%g
+s%@LTLIBINTL@%$LTLIBINTL%g
s%@POSUB@%$POSUB%g
s%@EMACS@%$EMACS%g
s%@lispdir@%$lispdir%g
s%@PERL@%$PERL%g
s%@CROSS_COMPILING@%$CROSS_COMPILING%g
s%@CXX@%$CXX%g
+s%@GCC@%$GCC%g
+s%@LD@%$LD%g
+s%@with_gnu_ld@%$with_gnu_ld%g
s%@LTLIBOBJS@%$LTLIBOBJS%g
s%@LTALLOCA@%$LTALLOCA%g
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
# ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
# on $ac_dir but don't depend on user-specified configuration
# parameters.
done
fi
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_dir"/Rules-*; do
- cat "$f" >> "$ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
done
fi
;;
for m in lib/Makefile src/Makefile tests/Makefile; do
sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp
mv $m.tmp $m
+ done
+ for m in Makefile doc/Makefile; do
+ sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp
+ mv $m.tmp $m
+ done
+ for m in doc/Makefile; do
+ sed -e '/cd \$(srcdir) && rm -f /d' < $m > $m.tmp
+ mv $m.tmp $m
done
chmod a+x misc/gettextize
-This is a port of GNU Gettext 0.11-pre5 to MSDOS/DJGPP.
+This is a port of GNU Gettext 0.11 to MSDOS/DJGPP.
TO USE THE GNU GETTEXT LIBRARY YOU **MUST** MODIFY YOUR C-LIBRARY.
file the gettext keyword makes **ALWAYS** reference to the GNU gettext
function and **NEVER** to the BORLAND-compatibility gettext function.
- 2) The binary package gtxt0.11-pre5b.zip contains all needed files to get NLS
+ 2) The binary package gtxt0.11b.zip contains all needed files to get NLS
support for the following DJGPP ports:
bison-1.28 (bsn128s.zip)
enscript-1.5.0 (ens150s.zip)
See section #4 for further information about this issue.
To implement NLS support for one of those packages you will also need
to download the following packages:
- gtxt0.11-pre5b.zip (binaries of GNU Gettext 0.11-pre5)
+ gtxt0.11b.zip (binaries of GNU Gettext 0.11)
licv17b.zip (binaries of GNU libiconv 1.7)
fil40b.zip (binaries of GNU Fileutils 4.0)
shl112b.zip (binaries of GNU Sh-utils 1.12 Date: 2000-08-11)
2.2.: Copy the binary distribution into the top DJGPP installation directory,
just unzip it preserving the directory structure running *ONE* of the
following commands:
- unzip32 gtxt0.11-pre5b.zip or
- djtarx gtxt0.11-pre5b.zip or
- pkunzip -d gtxt0.11-pre5b.zip
+ unzip32 gtxt0.11b.zip or
+ djtarx gtxt0.11b.zip or
+ pkunzip -d gtxt0.11b.zip
2.3.: Changing libc.a and conio.h.
Apart from the ussual directories, the binary package will create the
following directory:
- %DJDIR%/gnu/gtxt-011-pre5/djgpp/djdev-2.03
+ %DJDIR%/gnu/gtxt-011/djgpp/djdev-2.03
where %DJDIR% stands for the root of your DJGPP installation tree.
Cd into the djdev-2.03 directory. You will find the following files:
conio.diffs
conio.o contained in libc.a.
For all commands that will follow now I will assume that you have
- cd'ed into the %DJDIR%/gnu/gtxt-011-pre5/djgpp/djdev-2.03 directory,
+ cd'ed into the %DJDIR%/gnu/gtxt-011/djgpp/djdev-2.03 directory,
where %DJDIR% represents the path to your DJGPP installation. First,
you should backup your old header and library. For this task, run the
following command sequence (cp is the copy program from fil40b.zip):
directory. If you download the source distribution from one of the
DJGPP archives, just unzip it preserving the directory structure
running *ONE* of the following commands:
- unzip32 gtxt0.11-pre5s.zip or
- djtarx gtxt0.11-pre5s.zip or
- pkunzip -d gtxt0.11-pre5s.zip
+ unzip32 gtxt0.11s.zip or
+ djtarx gtxt0.11s.zip or
+ pkunzip -d gtxt0.11s.zip
Source distributions downloaded from one of the GNU FTP sites need
some more work to unpack. First, you *MUST* use the `djtar' program
to retrieve that file, and then invoke `djtar' to unpack the
distribution. Here is how:
- djtar -x -p -o gettext-0.11-pre5/djgpp/fnchange.lst gettext-0.11-pre5.tar.gz > lst
- djtar -x -n lst gettext-0.11-pre5.tar.gz
+ djtar -x -p -o gettext-0.11/djgpp/fnchange.lst gettext-0.11.tar.gz > lst
+ djtar -x -n lst gettext-0.11.tar.gz
(The name of the distribution archive and the top-level directory will
- be different for versions other than 0.11-pre5.)
+ be different for versions other than 0.11.)
It is always recommended to download the DJGPP packages from some
Simtel.NET mirror and *NOT* the original GNU distribution because
no-NLS
If for some reason you want no NLS support you will have to reconfigure
- the package. For this purpose cd into the top srcdir (gtxt-011-pre5)
+ the package. For this purpose cd into the top srcdir (gtxt-011)
and run the following commands:
make distclean
djgpp\config no-NLS
To build the programs in a directory other than where the sources are,
you must add a parameter that specifies the source directory,
e.g:
- x:\src\gnu\gtxt-011-pre5\djgpp\config x:/src/gnu/gtxt-011-pre5 no-NLS
+ x:\src\gnu\gtxt-011\djgpp\config x:/src/gnu/gtxt-011 no-NLS
Lets assume you want to build the binaries in a directory placed on a
different drive (z:\build in this case) from where the sources are,
then you will run the following commands:
z:
cd \build
- x:\src\gnu\gtxt-011-pre5\djgpp\config x:/src/gnu/gtxt-011-pre5 no-NLS
+ x:\src\gnu\gtxt-011\djgpp\config x:/src/gnu/gtxt-011 no-NLS
If you want NLS support you will omit "no-NLS" or replace it by
"NLS" in the above examples.
be replaced.
4.1.: To reconfigure and recompile a source package with NLS support you
- *MUST* install the gtxt0.11-pre5b.zip and licv17b.zip packages
+ *MUST* install the gtxt0.11b.zip and licv17b.zip packages
first. NLS support will **NOT** work with any prior version of the above
- mentioned packages. Before installing gtxt0.11-pre5b.zip and licv17b.zip
+ mentioned packages. Before installing gtxt0.11b.zip and licv17b.zip
you *MUST* deinstall the old packages if you ever have installed them.
For this purpose use the provided manifest files from the old packages.
- Old packages means previous beta releases of gtxt0.11-pre5b.zip and licv17b.zip
+ Old packages means previous beta releases of gtxt0.11b.zip and licv17b.zip
*AND* also previous versions of gettext like gettext 0.10.32, etc.
4.2.: We will assume that the required sources will be unzipped into
This will create the directory:
/src/gnu/bison-1.28
- The binary package gtxt0.11-pre5b.zip will create the directory:
- %DJDIR%/gnu/gtxt-011-pre5/djgpp/NLS_for_djgpp_packages/bison-1.28
+ The binary package gtxt0.11b.zip will create the directory:
+ %DJDIR%/gnu/gtxt-011/djgpp/NLS_for_djgpp_packages/bison-1.28
This directory contains all needed files.
The files are:
bison-1.28/djconfig.bat (new .bat file that replaces the original one.)
Now we will xcopy the needed files into the original bison-1.28 directory.
First we will cd into the bison-1.28 directory and then we will run the
following command:
- xcopy %DJDIR%\gnu\gtxt-011-pre5\djgpp\NLS_for_djgpp_packages\bison-1.28 /v/s/e
+ xcopy %DJDIR%\gnu\gtxt-011\djgpp\NLS_for_djgpp_packages\bison-1.28 /v/s/e
4.3.: Before the package can be reconfigured, the old configuration must be
cleared. Run the command:
-gettext-0.11-pre5/config.h.in gettext-0.11-pre5/config.h-in
-gettext-0.11-pre5/doc/gettext_1.html gettext-0.11-pre5/doc/gettext.1-html
-gettext-0.11-pre5/doc/gettext_10.html gettext-0.11-pre5/doc/gettext.10-html
-gettext-0.11-pre5/doc/gettext_11.html gettext-0.11-pre5/doc/gettext.11-html
-gettext-0.11-pre5/doc/gettext_12.html gettext-0.11-pre5/doc/gettext.12-html
-gettext-0.11-pre5/doc/gettext_13.html gettext-0.11-pre5/doc/gettext.13-html
-gettext-0.11-pre5/doc/gettext_14.html gettext-0.11-pre5/doc/gettext.14-html
-gettext-0.11-pre5/doc/gettext_2.html gettext-0.11-pre5/doc/gettext.2-html
-gettext-0.11-pre5/doc/gettext_3.html gettext-0.11-pre5/doc/gettext.3-html
-gettext-0.11-pre5/doc/gettext_4.html gettext-0.11-pre5/doc/gettext.4-html
-gettext-0.11-pre5/doc/gettext_5.html gettext-0.11-pre5/doc/gettext.5-html
-gettext-0.11-pre5/doc/gettext_6.html gettext-0.11-pre5/doc/gettext.6-html
-gettext-0.11-pre5/doc/gettext_7.html gettext-0.11-pre5/doc/gettext.7-html
-gettext-0.11-pre5/doc/gettext_8.html gettext-0.11-pre5/doc/gettext.8-html
-gettext-0.11-pre5/doc/gettext_9.html gettext-0.11-pre5/doc/gettext.9-html
-gettext-0.11-pre5/doc/gettext_foot.html gettext-0.11-pre5/doc/gettext.foot-html
-gettext-0.11-pre5/doc/gettext_toc.html gettext-0.11-pre5/doc/gettext.toc-html
-gettext-0.11-pre5/man/gettext.3.html gettext-0.11-pre5/man/gettext.3-html
-gettext-0.11-pre5/man/ngettext.3.html gettext-0.11-pre5/man/ngettext.3-html
-gettext-0.11-pre5/man/textdomain.3.html gettext-0.11-pre5/man/textdomain.3-html
-gettext-0.11-pre5/man/bindtextdomain.3.html gettext-0.11-pre5/man/bindtextdomain.3-html
-gettext-0.11-pre5/man/bind_textdomain_codeset.3.html gettext-0.11-pre5/man/bind_textdomain_codeset.3-html
-gettext-0.11-pre5/man/gettext.3.in gettext-0.11-pre5/man/gettext.3-in
-gettext-0.11-pre5/man/ngettext.3.in gettext-0.11-pre5/man/ngettext.3-in
-gettext-0.11-pre5/man/textdomain.3.in gettext-0.11-pre5/man/textdomain.3-in
-gettext-0.11-pre5/man/bindtextdomain.3.in gettext-0.11-pre5/man/bindtextdomain.3-in
-gettext-0.11-pre5/man/bind_textdomain_codeset.3.in gettext-0.11-pre5/man/bind_textdomain_codeset.3-in
-gettext-0.11-pre5/po/Makefile.in.in gettext-0.11-pre5/po/Makefile.in-in
-gettext-0.11-pre5/tests/gettext-1 gettext-0.11-pre5/tests/gettext.1
-gettext-0.11-pre5/tests/gettext-2 gettext-0.11-pre5/tests/gettext.2
-gettext-0.11-pre5/tests/msgcmp-1 gettext-0.11-pre5/tests/msgcmp.1
-gettext-0.11-pre5/tests/msgcmp-2 gettext-0.11-pre5/tests/msgcmp.2
-gettext-0.11-pre5/tests/msgfmt-1 gettext-0.11-pre5/tests/msgfmt.1
-gettext-0.11-pre5/tests/msgfmt-2 gettext-0.11-pre5/tests/msgfmt.2
-gettext-0.11-pre5/tests/msgfmt-3 gettext-0.11-pre5/tests/msgfmt.3
-gettext-0.11-pre5/tests/msgfmt-4 gettext-0.11-pre5/tests/msgfmt.4
-gettext-0.11-pre5/tests/msgmerge-1 gettext-0.11-pre5/tests/msgmerge.1
-gettext-0.11-pre5/tests/msgmerge-2 gettext-0.11-pre5/tests/msgmerge.2
-gettext-0.11-pre5/tests/msgmerge-3 gettext-0.11-pre5/tests/msgmerge.3
-gettext-0.11-pre5/tests/msgmerge-4 gettext-0.11-pre5/tests/msgmerge.4
-gettext-0.11-pre5/tests/msgmerge-5 gettext-0.11-pre5/tests/msgmerge.5
-gettext-0.11-pre5/tests/msgunfmt-1 gettext-0.11-pre5/tests/msgunfmt.1
-gettext-0.11-pre5/tests/xgettext-1 gettext-0.11-pre5/tests/xgettext.1
-gettext-0.11-pre5/tests/xgettext-2 gettext-0.11-pre5/tests/xgettext.2
-gettext-0.11-pre5/tests/xgettext-3 gettext-0.11-pre5/tests/xgettext.3
-gettext-0.11-pre5/tests/xgettext-4 gettext-0.11-pre5/tests/xgettext.4
-gettext-0.11-pre5/tests/xgettext-5 gettext-0.11-pre5/tests/xgettext.5
-gettext-0.11-pre5/tests/xgettext-6 gettext-0.11-pre5/tests/xgettext.6
-gettext-0.11-pre5/tests/xgettext-7 gettext-0.11-pre5/tests/xgettext.7
-gettext-0.11-pre5/tests/xgettext-8 gettext-0.11-pre5/tests/xgettext.8
-gettext-0.11-pre5/tests/xgettext-9 gettext-0.11-pre5/tests/xgettext.9
-gettext-0.11-pre5/tests/xg-test1.ok.po gettext-0.11-pre5/tests/xg-test1.ok-po
-gettext-0.11-pre5/tests/plural-1 gettext-0.11-pre5/tests/plural.1
-gettext-0.11-pre5/tests/plural-2 gettext-0.11-pre5/tests/plural.2
+gettext-0.11/config.h.in gettext-0.11/config.h-in
+gettext-0.11/doc/gettext_1.html gettext-0.11/doc/gettext.1-html
+gettext-0.11/doc/gettext_10.html gettext-0.11/doc/gettext.10-html
+gettext-0.11/doc/gettext_11.html gettext-0.11/doc/gettext.11-html
+gettext-0.11/doc/gettext_12.html gettext-0.11/doc/gettext.12-html
+gettext-0.11/doc/gettext_13.html gettext-0.11/doc/gettext.13-html
+gettext-0.11/doc/gettext_14.html gettext-0.11/doc/gettext.14-html
+gettext-0.11/doc/gettext_2.html gettext-0.11/doc/gettext.2-html
+gettext-0.11/doc/gettext_3.html gettext-0.11/doc/gettext.3-html
+gettext-0.11/doc/gettext_4.html gettext-0.11/doc/gettext.4-html
+gettext-0.11/doc/gettext_5.html gettext-0.11/doc/gettext.5-html
+gettext-0.11/doc/gettext_6.html gettext-0.11/doc/gettext.6-html
+gettext-0.11/doc/gettext_7.html gettext-0.11/doc/gettext.7-html
+gettext-0.11/doc/gettext_8.html gettext-0.11/doc/gettext.8-html
+gettext-0.11/doc/gettext_9.html gettext-0.11/doc/gettext.9-html
+gettext-0.11/doc/gettext_foot.html gettext-0.11/doc/gettext.foot-html
+gettext-0.11/doc/gettext_toc.html gettext-0.11/doc/gettext.toc-html
+gettext-0.11/man/gettext.3.html gettext-0.11/man/gettext.3-html
+gettext-0.11/man/ngettext.3.html gettext-0.11/man/ngettext.3-html
+gettext-0.11/man/textdomain.3.html gettext-0.11/man/textdomain.3-html
+gettext-0.11/man/bindtextdomain.3.html gettext-0.11/man/bindtextdomain.3-html
+gettext-0.11/man/bind_textdomain_codeset.3.html gettext-0.11/man/bind_textdomain_codeset.3-html
+gettext-0.11/man/gettext.3.in gettext-0.11/man/gettext.3-in
+gettext-0.11/man/ngettext.3.in gettext-0.11/man/ngettext.3-in
+gettext-0.11/man/textdomain.3.in gettext-0.11/man/textdomain.3-in
+gettext-0.11/man/bindtextdomain.3.in gettext-0.11/man/bindtextdomain.3-in
+gettext-0.11/man/bind_textdomain_codeset.3.in gettext-0.11/man/bind_textdomain_codeset.3-in
+gettext-0.11/po/Makefile.in.in gettext-0.11/po/Makefile.in-in
+gettext-0.11/tests/gettext-1 gettext-0.11/tests/gettext.1
+gettext-0.11/tests/gettext-2 gettext-0.11/tests/gettext.2
+gettext-0.11/tests/msgcmp-1 gettext-0.11/tests/msgcmp.1
+gettext-0.11/tests/msgcmp-2 gettext-0.11/tests/msgcmp.2
+gettext-0.11/tests/msgfmt-1 gettext-0.11/tests/msgfmt.1
+gettext-0.11/tests/msgfmt-2 gettext-0.11/tests/msgfmt.2
+gettext-0.11/tests/msgfmt-3 gettext-0.11/tests/msgfmt.3
+gettext-0.11/tests/msgfmt-4 gettext-0.11/tests/msgfmt.4
+gettext-0.11/tests/msgmerge-1 gettext-0.11/tests/msgmerge.1
+gettext-0.11/tests/msgmerge-2 gettext-0.11/tests/msgmerge.2
+gettext-0.11/tests/msgmerge-3 gettext-0.11/tests/msgmerge.3
+gettext-0.11/tests/msgmerge-4 gettext-0.11/tests/msgmerge.4
+gettext-0.11/tests/msgmerge-5 gettext-0.11/tests/msgmerge.5
+gettext-0.11/tests/msgunfmt-1 gettext-0.11/tests/msgunfmt.1
+gettext-0.11/tests/xgettext-1 gettext-0.11/tests/xgettext.1
+gettext-0.11/tests/xgettext-2 gettext-0.11/tests/xgettext.2
+gettext-0.11/tests/xgettext-3 gettext-0.11/tests/xgettext.3
+gettext-0.11/tests/xgettext-4 gettext-0.11/tests/xgettext.4
+gettext-0.11/tests/xgettext-5 gettext-0.11/tests/xgettext.5
+gettext-0.11/tests/xgettext-6 gettext-0.11/tests/xgettext.6
+gettext-0.11/tests/xgettext-7 gettext-0.11/tests/xgettext.7
+gettext-0.11/tests/xgettext-8 gettext-0.11/tests/xgettext.8
+gettext-0.11/tests/xgettext-9 gettext-0.11/tests/xgettext.9
+gettext-0.11/tests/xg-test1.ok.po gettext-0.11/tests/xg-test1.ok-po
+gettext-0.11/tests/plural-1 gettext-0.11/tests/plural.1
+gettext-0.11/tests/plural-2 gettext-0.11/tests/plural.2
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
# Documentation in Postscript format.
# List of texinfo sources @included by gettext.texi, excluding version.texi.
gettext_TEXINFOS = \
xgettext.texi msginit.texi msgmerge.texi msgcat.texi msgconv.texi \
- msggrep.texi msgexec.texi msguniq.texi msgcomm.texi msgcmp.texi \
- msgattrib.texi msgen.texi msgfmt.texi msgunfmt.texi \
+ msggrep.texi msgfilter.texi msguniq.texi msgcomm.texi msgcmp.texi \
+ msgattrib.texi msgen.texi msgexec.texi msgfmt.texi msgunfmt.texi \
iso-639.texi iso-3166.texi
-EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi $(EXTRA_DIST_html) texi2html
+EXTRA_DIST = iso-639.sed iso-3166.sed ISO_639 ISO_3166 nls.texi matrix.texi texi2html
-# This strange way of taking wildcards is a workaround to an automake-1.5 bug
-# which would occur if we wrote $(wildcard $(srcdir)/gettext_*.html).
-EXTRA_DIST_html = $(notdir $(wildcard gettext_*.html) $(wildcard $(addprefix $(srcdir), $(addprefix /, gettext_*.html))))
CLEANFILES = gettext.pdf gettext.html
# gettext.dvi and gettext.ps are already known to automake.
MAINTAINERCLEANFILES = gettext_*.html
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- $(mkinstalldirs) $(distdir)/
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
install-data-local: install-html
installdirs-local: installdirs-html
uninstall-local: uninstall-html
+# Hidden from automake, but really activated. Works around an automake-1.5 bug.
+#distdir: dist-html
html: html-split
install-html: install-html-split
uninstall-html: uninstall-html-split
+dist-html: dist-html-split
# Documentation in DVI format.
uninstall-html-split:
$(RM) $(DESTDIR)$(htmldir)/gettext_*.html
+dist-html-monolithic:
+ $(mkinstalldirs) $(distdir)/
+ file=gettext.html; \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ cp -p $$d/$$file $(distdir)/$$file || exit 1
+
+# We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work.
+dist-html-split:
+ $(mkinstalldirs) $(distdir)/
+ file=gettext_toc.html; \
+ if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ for file in `cd $$d && echo gettext_*.html`; do \
+ cp -p $$d/$$file $(distdir)/$$file || exit 1; \
+ done
+
# One more automake bug.
installdirs: installdirs-local
# Tell versions [3.59,3.63) of GNU make to not export all variables.
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
\1f
Indirect:
-gettext.info-1: 1411
-gettext.info-2: 46553
-gettext.info-3: 91891
-gettext.info-4: 140946
-gettext.info-5: 189556
-gettext.info-6: 238120
-gettext.info-7: 287808
+gettext.info-1: 1417
+gettext.info-2: 46928
+gettext.info-3: 93218
+gettext.info-4: 142279
+gettext.info-5: 191750
+gettext.info-6: 240311
+gettext.info-7: 289557
\1f
Tag Table:
(Indirect)
-Node: Top\7f1411
-Node: Introduction\7f9603
-Node: Why\7f11461
-Ref: Why-Footnote-1\7f14568
-Node: Concepts\7f14724
-Node: Aspects\7f18137
-Node: Files\7f23919
-Node: Overview\7f25814
-Node: Basics\7f36652
-Node: Installation\7f37482
-Node: PO Files\7f39424
-Ref: PO Files-Footnote-1\7f46426
-Node: Main PO Commands\7f46553
-Node: Entry Positioning\7f51625
-Node: Normalizing\7f57079
-Node: Sources\7f61532
-Node: Triggering\7f62802
-Node: Mark Keywords\7f65818
-Node: Marking\7f69366
-Node: c-format\7f77082
-Node: Special cases\7f80838
-Node: Template\7f83700
-Node: xgettext Invocation\7f84052
-Node: Creating\7f89380
-Node: msginit Invocation\7f90271
-Node: Header Entry\7f91891
-Node: Updating\7f98048
-Node: msgmerge Invocation\7f98803
-Node: Translated Entries\7f102655
-Node: Fuzzy Entries\7f104013
-Node: Untranslated Entries\7f107183
-Node: Obsolete Entries\7f109105
-Node: Modifying Translations\7f112320
-Node: Modifying Comments\7f120271
-Node: Subedit\7f124684
-Node: C Sources Context\7f128563
-Node: Auxiliary\7f133666
-Node: Compendium\7f136891
-Node: Creating Compendia\7f137501
-Node: Using Compendia\7f140058
-Node: Manipulating\7f140946
-Node: msgcat Invocation\7f144171
-Node: msgconv Invocation\7f147400
-Node: msggrep Invocation\7f149560
-Node: msgexec Invocation\7f153052
-Node: msguniq Invocation\7f155639
-Node: msgcomm Invocation\7f158507
-Node: msgcmp Invocation\7f161531
-Node: msgattrib Invocation\7f162761
-Node: msgen Invocation\7f165876
-Node: Binaries\7f168018
-Node: msgfmt Invocation\7f168350
-Node: msgunfmt Invocation\7f173593
-Node: MO Files\7f175787
-Node: Users\7f183878
-Node: Matrix\7f185361
-Node: Installers\7f186565
-Node: End Users\7f187735
-Node: Programmers\7f188384
-Node: catgets\7f189556
-Node: Interface to catgets\7f190960
-Node: Problems with catgets\7f192964
-Node: gettext\7f193864
-Node: Interface to gettext\7f195322
-Node: Ambiguities\7f197663
-Node: Locating Catalogs\7f200356
-Ref: Locating Catalogs-Footnote-1\7f201503
-Ref: Locating Catalogs-Footnote-2\7f201728
-Node: Charset conversion\7f201877
-Node: Plural forms\7f204319
-Ref: Plural forms-Footnote-1\7f214912
-Node: GUI program problems\7f215004
-Node: Optimized gettext\7f220108
-Node: Comparison\7f221441
-Node: Using libintl.a\7f225713
-Node: gettext grok\7f226490
-Node: Temp Programmers\7f229122
-Node: Temp Implementations\7f229562
-Node: Temp catgets\7f230928
-Node: Temp WSI\7f232615
-Node: Temp Notes\7f234603
-Node: Translators\7f235092
-Node: Trans Intro 0\7f235471
-Node: Trans Intro 1\7f238120
-Node: Discussions\7f239984
-Node: Organization\7f243486
-Node: Central Coordination\7f245467
-Node: National Teams\7f246595
-Node: Sub-Cultures\7f249107
-Node: Organizational Ideas\7f250026
-Node: Mailing Lists\7f251029
-Node: Information Flow\7f252832
-Node: Maintainers\7f254965
-Node: Flat and Non-Flat\7f256735
-Node: Prerequisites\7f258218
-Node: gettextize Invocation\7f262359
-Node: Adjusting Files\7f266432
-Node: po/POTFILES.in\7f267841
-Node: po/LINGUAS\7f268783
-Node: po/Makevars\7f269565
-Node: configure.in\7f271151
-Node: config.guess\7f273141
-Node: aclocal\7f274254
-Node: acconfig\7f275488
-Node: Makefile\7f275971
-Node: src/Makefile\7f278364
-Node: Programming Languages\7f281224
-Node: Language Implementors\7f281986
-Node: Programmers for other Languages\7f286807
-Node: Translators for other Languages\7f287373
-Node: List of Programming Languages\7f287808
-Node: C\7f288869
-Node: sh\7f289850
-Node: bash\7f290476
-Node: Python\7f291161
-Node: Common Lisp\7f292225
-Node: clisp C\7f292931
-Node: Emacs Lisp\7f293653
-Node: librep\7f294353
-Node: Smalltalk\7f294992
-Node: Java\7f296065
-Node: gawk\7f298735
-Node: Pascal\7f299512
-Node: wxWindows\7f300728
-Node: YCP\7f301462
-Node: Perl\7f302122
-Node: PHP\7f302740
-Node: Pike\7f303443
-Node: List of Data Formats\7f304069
-Node: POT\7f304455
-Node: RST\7f304699
-Node: Conclusion\7f304897
-Node: History\7f305397
-Node: References\7f309499
-Node: Language Codes\7f311054
-Node: Country Codes\7f314957
+Node: Top\7f1417
+Node: Introduction\7f10024
+Node: Why\7f11882
+Ref: Why-Footnote-1\7f14989
+Node: Concepts\7f15145
+Node: Aspects\7f18558
+Node: Files\7f24340
+Node: Overview\7f26235
+Node: Basics\7f37029
+Node: Installation\7f37859
+Node: PO Files\7f39801
+Ref: PO Files-Footnote-1\7f46801
+Node: Main PO Commands\7f46928
+Node: Entry Positioning\7f51998
+Node: Normalizing\7f57452
+Node: Sources\7f61905
+Node: Triggering\7f63175
+Node: Mark Keywords\7f66191
+Node: Marking\7f69739
+Node: c-format\7f77455
+Node: Special cases\7f81357
+Node: Template\7f84085
+Node: xgettext Invocation\7f84437
+Node: Creating\7f90707
+Node: msginit Invocation\7f91598
+Node: Header Entry\7f93218
+Node: Updating\7f99375
+Node: msgmerge Invocation\7f100130
+Node: Translated Entries\7f103982
+Node: Fuzzy Entries\7f105340
+Node: Untranslated Entries\7f108510
+Node: Obsolete Entries\7f110432
+Node: Modifying Translations\7f113647
+Node: Modifying Comments\7f121604
+Node: Subedit\7f126017
+Node: C Sources Context\7f129896
+Node: Auxiliary\7f134999
+Node: Compendium\7f138224
+Node: Creating Compendia\7f138834
+Node: Using Compendia\7f141391
+Node: Manipulating\7f142279
+Node: msgcat Invocation\7f145758
+Node: msgconv Invocation\7f148987
+Node: msggrep Invocation\7f151147
+Node: msgfilter Invocation\7f154715
+Node: msguniq Invocation\7f158563
+Node: msgcomm Invocation\7f161433
+Node: msgcmp Invocation\7f164457
+Node: msgattrib Invocation\7f165687
+Node: msgen Invocation\7f168802
+Node: msgexec Invocation\7f171152
+Node: Binaries\7f173203
+Node: msgfmt Invocation\7f173535
+Node: msgunfmt Invocation\7f178778
+Node: MO Files\7f180972
+Node: Users\7f189063
+Node: Matrix\7f190546
+Node: Installers\7f191750
+Node: End Users\7f192920
+Node: Programmers\7f193569
+Node: catgets\7f194742
+Node: Interface to catgets\7f196145
+Node: Problems with catgets\7f198149
+Node: gettext\7f199049
+Node: Interface to gettext\7f200507
+Node: Ambiguities\7f202849
+Node: Locating Catalogs\7f205542
+Ref: Locating Catalogs-Footnote-1\7f206689
+Ref: Locating Catalogs-Footnote-2\7f206914
+Node: Charset conversion\7f207063
+Node: Plural forms\7f209505
+Ref: Plural forms-Footnote-1\7f220098
+Node: GUI program problems\7f220190
+Node: Optimized gettext\7f225294
+Node: Comparison\7f226627
+Node: Using libintl.a\7f230897
+Node: gettext grok\7f231330
+Node: Temp Programmers\7f233962
+Node: Temp Implementations\7f234402
+Node: Temp catgets\7f235768
+Node: Temp WSI\7f237455
+Node: Temp Notes\7f239443
+Node: Translators\7f239932
+Node: Trans Intro 0\7f240311
+Node: Trans Intro 1\7f242960
+Node: Discussions\7f244824
+Node: Organization\7f248326
+Node: Central Coordination\7f250307
+Node: National Teams\7f251435
+Node: Sub-Cultures\7f253947
+Node: Organizational Ideas\7f254866
+Node: Mailing Lists\7f255869
+Node: Information Flow\7f257672
+Node: Maintainers\7f259805
+Node: Flat and Non-Flat\7f261649
+Node: Prerequisites\7f263132
+Node: gettextize Invocation\7f267271
+Node: Adjusting Files\7f271719
+Node: po/POTFILES.in\7f273321
+Node: po/LINGUAS\7f274263
+Node: po/Makevars\7f275045
+Node: configure.in\7f276631
+Node: config.guess\7f278606
+Node: aclocal\7f279719
+Node: acconfig\7f280998
+Node: Makefile\7f281481
+Node: src/Makefile\7f283869
+Node: lib/gettext.h\7f286852
+Node: autoconf macros\7f289077
+Node: AM_GNU_GETTEXT\7f289557
+Node: AM_ICONV\7f292859
+Node: Programming Languages\7f295045
+Node: Language Implementors\7f295866
+Node: Programmers for other Languages\7f300687
+Node: Translators for other Languages\7f301253
+Node: Maintainers for other Languages\7f301690
+Node: List of Programming Languages\7f302917
+Node: C\7f303978
+Node: sh\7f304959
+Node: bash\7f305585
+Node: Python\7f306270
+Node: Common Lisp\7f307334
+Node: clisp C\7f308048
+Node: Emacs Lisp\7f308770
+Node: librep\7f309476
+Node: Smalltalk\7f310127
+Node: Java\7f311200
+Node: gawk\7f313870
+Node: Pascal\7f314647
+Node: wxWindows\7f315863
+Node: YCP\7f316597
+Node: Perl\7f317257
+Node: PHP\7f317875
+Node: Pike\7f318578
+Node: List of Data Formats\7f319204
+Node: POT\7f319590
+Node: RST\7f319834
+Node: Conclusion\7f320032
+Node: History\7f320532
+Node: References\7f324634
+Node: Language Codes\7f326189
+Node: Country Codes\7f330092
\1f
End Tag Table
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
Creating a New PO File
* msginit Invocation:: Invoking the `msginit' Program
-* Header Entry:: Fields in the Header Entry
+* Header Entry:: Filling in the Header Entry
Updating Existing PO Files
* msgcat Invocation:: Invoking the `msgcat' Program
* msgconv Invocation:: Invoking the `msgconv' Program
* msggrep Invocation:: Invoking the `msggrep' Program
-* msgexec Invocation:: Invoking the `msgexec' Program
+* msgfilter Invocation:: Invoking the `msgfilter' Program
* msguniq Invocation:: Invoking the `msguniq' Program
* msgcomm Invocation:: Invoking the `msgcomm' Program
* msgcmp Invocation:: Invoking the `msgcmp' Program
* msgattrib Invocation:: Invoking the `msgattrib' Program
* msgen Invocation:: Invoking the `msgen' Program
+* msgexec Invocation:: Invoking the `msgexec' Program
Producing Binary MO Files
* Prerequisites:: Prerequisite Works
* gettextize Invocation:: Invoking the `gettextize' Program
* Adjusting Files:: Files You Must Create or Alter
+* autoconf macros:: Autoconf macros for use in `configure.in'
Files You Must Create or Alter
* acconfig:: `acconfig.h' at top level
* Makefile:: `Makefile.in' at top level
* src/Makefile:: `Makefile.in' in `src/'
+* lib/gettext.h:: `gettext.h' in `lib/'
+
+Autoconf macros for use in `configure.in'
+
+* AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4'
+* AM_ICONV:: AM_ICONV in `iconv.m4'
Other Programming Languages
* Language Implementors:: The Language Implementor's View
* Programmers for other Languages:: The Programmer's View
* Translators for other Languages:: The Translator's View
+* Maintainers for other Languages:: The Maintainer's View
* List of Programming Languages:: Individual Programming Languages
* List of Data Formats:: Internationalizable Data
The following diagram summarizes the relation between the files
handled by GNU `gettext' and the tools acting on these files. It is
-followed by a somewhat detailed explanations, which you should read
-while keeping an eye on the diagram. Having a clear understanding of
-these interrelations would surely help programmers, translators and
+followed by somewhat detailed explanations, which you should read while
+keeping an eye on the diagram. Having a clear understanding of these
+interrelations will surely help programmers, translators and
maintainers.
Original C Sources ---> PO mode ---> Marked C Sources ---.
central header file:
#define _(String) (String)
- #define N_(String) (String)
+ #define N_(String) String
#define textdomain(Domain)
#define bindtextdomain(Package, Directory)
#include <libintl.h>
#define _(String) gettext (String)
- #define gettext_noop(String) (String)
+ #define gettext_noop(String) String
#define N_(String) gettext_noop (String)
- and link against `libintl.a' or `libintl.so'. Note that on GNU
+and link against `libintl.a' or `libintl.so'. Note that on GNU
systems, you don't need to link with `libintl' because the `gettext'
library functions are already contained in GNU libc. That is all you
have to change.
do their job the best they can. For the Translation Project to work
smoothly, it is important that maintainers do not carry translation
concerns on their already loaded shoulders, and that translators be
-kept as free as possible of programmatic concerns.
+kept as free as possible of programming concerns.
The only concern maintainers should have is carefully marking new
strings as translatable, when they should be, and do not otherwise
Translation Project, or will give a hard time to other participants! In
particular, maintainers should relax and include all available official
PO files in their distributions, even if these have not recently been
-updated, without banging or otherwise trying to exert pressure on the
-translator teams to get the job done. The pressure should rather come
-from the community of users speaking a particular language, and
-maintainers should consider themselves fairly relieved of any concern
-about the adequacy of translation files. On the other hand, translators
-should reasonably try updating the PO files they are responsible for,
-while the package is undergoing pretest, prior to an official
-distribution.
+updated, without exerting pressure on the translator teams to get the
+job done. The pressure should rather come from the community of users
+speaking a particular language, and maintainers should consider
+themselves fairly relieved of any concern about the adequacy of
+translation files. On the other hand, translators should reasonably
+try updating the PO files they are responsible for, while the package
+is undergoing pretest, prior to an official distribution.
Once the PO file is complete and dependable, the `msgfmt' program is
used for turning the PO file into a machine-oriented format, which may
yield efficient retrieval of translations by the programs of the
package, whenever needed at runtime (*note MO Files::). *Note msgfmt
-Invocation::, for more information about all modalities of execution
-for the `msgfmt' program.
+Invocation::, for more information about all modes of execution for the
+`msgfmt' program.
Finally, the modified and marked C sources are compiled and linked
with the GNU `gettext' library, usually through the operation of
`c-format'
`no-c-format'
These flags should not be added by a human. Instead only the
- `xgettext' program adds them. In an automatized PO file processing
+ `xgettext' program adds them. In an automated PO file processing
system as proposed here the user changes would be thrown away
again as soon as the `xgettext' program generates a new template
file.
Each of UNTRANSLATED-STRING and TRANSLATED-STRING respects the C
syntax for a character string, including the surrounding quotes and
-imbedded backslashed escape sequences. When the time comes to write
+embedded backslashed escape sequences. When the time comes to write
multi-line strings, one should not use escaped newlines. Instead, a
closing quote should follow the last character on the line to be
continued, and an opening quote should resume the string at the
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
used when the translator is done with the PO file. The former is a bit
less verbose than the latter. If the file has been modified, it is
saved to disk first. In both cases, and prior to all this, the
-commands check if some untranslated message remains in the PO file and,
-if yes, the translator is asked if she really wants to leave off
-working with this PO file. This is the preferred way of getting rid of
-an Emacs PO file buffer. Merely killing it through the usual command
+commands check if any untranslated messages remain in the PO file and,
+if so, the translator is asked if she really wants to leave off working
+with this PO file. This is the preferred way of getting rid of an
+Emacs PO file buffer. Merely killing it through the usual command
`C-x k' (`kill-buffer') is not the tidiest way to proceed.
The command `0' (`po-other-window') is another, softer way, to leave
There are many different ways for encoding a particular string into a
PO file entry, because there are so many different ways to split and
quote multi-line strings, and even, to represent special characters by
-backslahsed escaped sequences. Some features of PO mode rely on the
+backslashed escaped sequences. Some features of PO mode rely on the
ability for PO mode to scan an already existing PO file for a
particular string encoded into the `msgid' field of some entry. Even
if PO mode has internally all the built-in machinery for implementing
To prevent errors at runtime caused by translations the `msgfmt'
tool can check statically whether the arguments in the original and the
-translation string match in type and number. If this is not the case a
-warning will be given and the error cannot causes problems at runtime.
+translation string match in type and number. If this is not the case
+and the `-c' option has been passed to `msgfmt', `msgfmt' will give an
+error and refuse to produce a MO file. Thus consequent use of `msgfmt
+-c' will catch the error, so that it cannot cause cause problems at
+runtime.
If the word order in the above German translation would be correct one
would have to write
names a no-op. For the second we have to mark all access points to a
string from the array. So one solution can look like this:
- #define gettext_noop(String) (String)
+ #define gettext_noop(String) String
{
static const char *messages[] = {
The above is of course not the only solution. You could also come
along with the following one:
- #define gettext_noop(String) (String)
+ #define gettext_noop(String) String
{
static const char *messages[] = {
...
}
- But this has some drawbacks. First the programmer has to take care
-that he uses `gettext_noop' for the string `"a default message"'. A
-use of `gettext' could have in rare cases unpredictable results. The
-second reason is found in the internals of the GNU `gettext' Library
-which will make this solution less efficient.
+ But this has a drawback. The programmer has to take care that he
+uses `gettext_noop' for the string `"a default message"'. A use of
+`gettext' could have in rare cases unpredictable results.
One advantage is that you need not make control flow analysis to make
sure the output is really translated in any case. But this analysis is
invocations of `xgettext' on the same files with the same options
at different times are guaranteed to produce the same results.
+`--copyright-holder=STRING'
+ Set the copyright holder in the output. STRING should be the
+ copyright holder of the surrounding package. (Note that the msgstr
+ strings, extracted from the package's sources, belong to the
+ copyright holder of the package.) Translators are expected to
+ transfer or disclaim the copyright for their translations, so that
+ package maintainers can distribute them without legal risk. If
+ STRING is empty, the output files are marked as being in the
+ public domain; in this case, the translators are expected to
+ disclaim their copyright, again so that package maintainers can
+ distribute them without legal risk.
+
+ The default value for STRING is the Free Software Foundation, Inc.,
+ simply because `xgettext' was first used in the GNU project.
+
`--foreign-user'
- Omit FSF copyright in output. This can be useful for translators
- outside the GNU project.
+ Omit FSF copyright in output. This option is equivalent to
+ `--copyright-holder='''. It can be useful for packages outside
+ the GNU project that want their translations to be in the public
+ domain.
`-m [STRING]'
`--msgstr-prefix[=STRING]'
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
Modifying Translations
======================
- PO mode prevents direct edition of the PO file, by the usual means
-Emacs give for altering a buffer's contents. By doing so, it pretends
-helping the translator to avoid little clerical errors about the
-overall file format, or the proper quoting of strings, as those errors
-would be easily made. Other kinds of errors are still possible, but
-some may be caught and diagnosed by the batch validation process, which
-the translator may always trigger by the `V' command. For all other
-errors, the translator has to rely on her own judgment, and also on the
-linguistic reports submitted to her by the users of the translated
-package, having the same mother tongue.
+ PO mode prevents direct modification of the PO file, by the usual
+means Emacs gives for altering a buffer's contents. By doing so, it
+pretends helping the translator to avoid little clerical errors about
+the overall file format, or the proper quoting of strings, as those
+errors would be easily made. Other kinds of errors are still possible,
+but some may be caught and diagnosed by the batch validation process,
+which the translator may always trigger by the `V' command. For all
+other errors, the translator has to rely on her own judgment, and also
+on the linguistic reports submitted to her by the users of the
+translated package, having the same mother tongue.
When the time comes to create a translation, correct an error
diagnosed mechanically or reported by a user, the translators have to
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
special dialect or orthography - for example, German as written in
Switzerland versus German as written in Germany -, she needs to apply
some text processing to every message in the catalog. The tool for
-doing this is `msgexec'.
+doing this is `msgfilter'.
- Another use of `msgexec' is to produce approximately the POT file for
-which a given PO file was made. This can be done through a filter
-command like `msgexec sed -e d | sed -e '/^# /d''. Note that the
+ Another use of `msgfilter' is to produce approximately the POT file
+for which a given PO file was made. This can be done through a filter
+command like `msgfilter sed -e d | sed -e '/^# /d''. Note that the
original POT file may have had different comments and different plural
message counts, that's why it's better to use the original POT file if
available.
+ When a translator wants to check her translations, for example
+according to orthography rules or using a non-interactive spell
+checker, she can do so using the `msgexec' program.
+
When third party tools create PO or POT files, sometimes duplicates
cannot be avoided. But the GNU `gettext' tools give an error when they
encounter duplicate msgids in the same file and in the same domain. To
* msgcat Invocation:: Invoking the `msgcat' Program
* msgconv Invocation:: Invoking the `msgconv' Program
* msggrep Invocation:: Invoking the `msggrep' Program
-* msgexec Invocation:: Invoking the `msgexec' Program
+* msgfilter Invocation:: Invoking the `msgfilter' Program
* msguniq Invocation:: Invoking the `msguniq' Program
* msgcomm Invocation:: Invoking the `msgcomm' Program
* msgcmp Invocation:: Invoking the `msgcmp' Program
* msgattrib Invocation:: Invoking the `msgattrib' Program
* msgen Invocation:: Invoking the `msgen' Program
+* msgexec Invocation:: Invoking the `msgexec' Program
\1f
File: gettext.info, Node: msgcat Invocation, Next: msgconv Invocation, Prev: Manipulating, Up: Manipulating
Output version information and exit.
\1f
-File: gettext.info, Node: msggrep Invocation, Next: msgexec Invocation, Prev: msgconv Invocation, Up: Manipulating
+File: gettext.info, Node: msggrep Invocation, Next: msgfilter Invocation, Prev: msgconv Invocation, Up: Manipulating
Invoking the `msggrep' Program
==============================
`-N SOURCEFILE'
`--location=SOURCEFILE'
- Select messages extracted from SOURCEFILE.
+ Select messages extracted from SOURCEFILE. SOURCEFILE can be
+ either a literal file name or a wildcard pattern.
`-M DOMAINNAME'
`--domain=DOMAINNAME'
Output version information and exit.
\1f
-File: gettext.info, Node: msgexec Invocation, Next: msguniq Invocation, Prev: msggrep Invocation, Up: Manipulating
+File: gettext.info, Node: msgfilter Invocation, Next: msguniq Invocation, Prev: msggrep Invocation, Up: Manipulating
-Invoking the `msgexec' Program
-==============================
+Invoking the `msgfilter' Program
+================================
- msgexec [OPTION] FILTER [FILTER-OPTION]
+ msgfilter [OPTION] FILTER [FILTER-OPTION]
- The `msgexec' program applies a filter to all translations of a
+ The `msgfilter' program applies a filter to all translations of a
translation catalog.
Input file location
input and writes a modified translation to standard output. A
frequently used filter is `sed'.
+ Note: It is your responsibility to ensure that the FILTER can cope
+with input encoded in the translation catalog's encoding. If the
+FILTER wants input in a particular encoding, you can in a first step
+convert the translation catalog to that encoding using the `msgconv'
+program, before invoking `msgfilter'. If the FILTER wants input in the
+locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+`msgconv' program and then make `msgfilter' work in an UTF-8 locale, by
+using the `LC_ALL' environment variable.
+
+ Note: Most translations in a translation catalog don't end with a
+newline character. For this reason, it is important that the FILTER
+recognizes its last input line even if it ends without a newline, and
+that it doesn't add an undesired trailing newline at the end. The `sed'
+program on some platforms is known to ignore the last line of input if
+it is not terminated with a newline. You can use GNU `sed' instead; it
+does not have this limitation.
+
Useful FILTER-OPTIONs when the FILTER is `sed'
----------------------------------------------
`--indent'
Write the .po file using indented style.
+`--keep-header'
+ Keep the header entry, i.e. the message with `msgid ""',
+ unmodified, instead of filtering it. By default, the header entry
+ is subject to filtering like any other message.
+
`--no-location'
Do not write `#: FILENAME:LINE' lines.
Output version information and exit.
\1f
-File: gettext.info, Node: msguniq Invocation, Next: msgcomm Invocation, Prev: msgexec Invocation, Up: Manipulating
+File: gettext.info, Node: msguniq Invocation, Next: msgcomm Invocation, Prev: msgfilter Invocation, Up: Manipulating
Invoking the `msguniq' Program
==============================
Output version information and exit.
\1f
-File: gettext.info, Node: msgen Invocation, Prev: msgattrib Invocation, Up: Manipulating
+File: gettext.info, Node: msgen Invocation, Next: msgexec Invocation, Prev: msgattrib Invocation, Up: Manipulating
Invoking the `msgen' Program
============================
(generally created by xgettext). Untranslated entries are assigned a
translation that is identical to the msgid, and are marked fuzzy.
+ Note: `msginit --no-translator --locale=en' performs a very similar
+task. The main difference is that `msginit' cares specially about the
+header entry, whereas `msgen' doesn't.
+
Input file location
-------------------
Informative output
------------------
+`-h'
+`--help'
+ Display this help and exit.
+
+`-V'
+`--version'
+ Output version information and exit.
+
+\1f
+File: gettext.info, Node: msgexec Invocation, Prev: msgen Invocation, Up: Manipulating
+
+Invoking the `msgexec' Program
+==============================
+
+ msgexec [OPTION] COMMAND [COMMAND-OPTION]
+
+ The `msgexec' program applies a command to all translations of a
+translation catalog. The COMMAND can be any program that reads a
+translation from standard input. It is invoked once for each
+translation. Its output becomes msgexec's output. `msgexec''s return
+code is the maximum return code across all invocations.
+
+ A special builtin command called `0' outputs the translation,
+followed by a null byte. The output of `msgexec 0' is suitable as
+input for `xargs -0'.
+
+ During each COMMAND invocation, the environment variable
+`MSGEXEC_MSGID' is bound to the message's msgid, and the environment
+variable `MSGEXEC_LOCATION' is bound to the location in the PO file of
+the message.
+
+ Note: It is your responsibility to ensure that the COMMAND can cope
+with input encoded in the translation catalog's encoding. If the
+COMMAND wants input in a particular encoding, you can in a first step
+convert the translation catalog to that encoding using the `msgconv'
+program, before invoking `msgexec'. If the COMMAND wants input in the
+locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+`msgconv' program and then make `msgexec' work in an UTF-8 locale, by
+using the `LC_ALL' environment variable.
+
+Input file location
+-------------------
+
+`-i INPUTFILE'
+`--input=INPUTFILE'
+ Input PO file.
+
+`-D DIRECTORY'
+`--directory=DIRECTORY'
+ Add DIRECTORY to the list of directories. Source files are
+ searched relative to this list of directories. The resulting `.po'
+ file will be written relative to the current directory, though.
+
+ If no INPUTFILE is given or if it is `-', standard input is read.
+
+Informative output
+------------------
+
`-h'
`--help'
Display this help and exit.
this because a precomputed hashing table takes disk space, and does not
win _that_ much speed. The hash table contains indices to the sorted
array of strings in the MO file. Conflict resolution is done by double
-hashing. The precise hashing algorithm used is fairly dependent of GNU
+hashing. The precise hashing algorithm used is fairly dependent on GNU
`gettext' code, and is not documented here.
As for the strings themselves, they follow the hash file, and each
containing up-to-date information, should generally be found on the
Translation Project sites, and also on most GNU archive sites.
-\1f
-File: gettext.info, Node: Installers, Next: End Users, Prev: Matrix, Up: Users
-
-Magic for Installers
-====================
-
- By default, packages fully using GNU `gettext', internally, are
-installed in such a way that they to allow translation of messages. At
-_configuration_ time, those packages should automatically detect
-whether the underlying host system already provides the GNU `gettext'
-functions. If not, the GNU `gettext' library should be automatically
-prepared and used. Installers may use special options at configuration
-time for changing this behavior. The command `./configure
---with-included-gettext' bypasses system `gettext' to use the included
-GNU `gettext' instead, while `./configure --disable-nls' produces
-programs totally unable to translate messages.
-
- Internationalized packages have usually many `LL.po' files. Unless
-translations are disabled, all those available are installed together
-with the package. However, the environment variable `LINGUAS' may be
-set, prior to configuration, to limit the installed set. `LINGUAS'
-should then contain a space separated list of two-letter codes, stating
-which languages are allowed.
-
-\1f
-File: gettext.info, Node: End Users, Prev: Installers, Up: Users
-
-Magic for End Users
-===================
-
- We consider here those packages using GNU `gettext' internally, and
-for which the installers did not disable translation at _configure_
-time. Then, users only have to set the `LANG' environment variable to
-the appropriate `LL_CC' combination prior to using the programs in the
-package. *Note Matrix::. For example, let's presume a German site.
-At the shell prompt, users merely have to execute `setenv LANG de_DE'
-(in `csh') or `export LANG; LANG=de_DE' (in `sh'). They could even do
-this from their `.login' or `.profile' file.
-
-\1f
-File: gettext.info, Node: Programmers, Next: Translators, Prev: Users, Up: Top
-
-The Programmer's View
-*********************
-
- One aim of the current message catalog implementation provided by
-GNU `gettext' was to use the systems message catalog handling, if the
-installer wishes to do so. So we perhaps should first take a look at
-the solutions we know about. The people in the POSIX committee did not
-manage to agree on one of the semi-official standards which we'll
-describe below. In fact they couldn't agree on anything, so they
-decided only to include an example of an interface. The major Unix
-vendors are split in the usage of the two most important
-specifications: X/Open's catgets vs. Uniforum's gettext interface.
-We'll describe them both and later explain our solution of this dilemma.
-
-* Menu:
-
-* catgets:: About `catgets'
-* gettext:: About `gettext'
-* Comparison:: Comparing the two interfaces
-* Using libintl.a:: Using libintl.a in own programs
-* gettext grok:: Being a `gettext' grok
-* Temp Programmers:: Temporary Notes for the Programmers Chapter
-
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
versions, except that this permission notice may be stated in a
translation approved by the Foundation.
+\1f
+File: gettext.info, Node: Installers, Next: End Users, Prev: Matrix, Up: Users
+
+Magic for Installers
+====================
+
+ By default, packages fully using GNU `gettext', internally, are
+installed in such a way that they to allow translation of messages. At
+_configuration_ time, those packages should automatically detect
+whether the underlying host system already provides the GNU `gettext'
+functions. If not, the GNU `gettext' library should be automatically
+prepared and used. Installers may use special options at configuration
+time for changing this behavior. The command `./configure
+--with-included-gettext' bypasses system `gettext' to use the included
+GNU `gettext' instead, while `./configure --disable-nls' produces
+programs totally unable to translate messages.
+
+ Internationalized packages have usually many `LL.po' files. Unless
+translations are disabled, all those available are installed together
+with the package. However, the environment variable `LINGUAS' may be
+set, prior to configuration, to limit the installed set. `LINGUAS'
+should then contain a space separated list of two-letter codes, stating
+which languages are allowed.
+
+\1f
+File: gettext.info, Node: End Users, Prev: Installers, Up: Users
+
+Magic for End Users
+===================
+
+ We consider here those packages using GNU `gettext' internally, and
+for which the installers did not disable translation at _configure_
+time. Then, users only have to set the `LANG' environment variable to
+the appropriate `LL_CC' combination prior to using the programs in the
+package. *Note Matrix::. For example, let's presume a German site.
+At the shell prompt, users merely have to execute `setenv LANG de_DE'
+(in `csh') or `export LANG; LANG=de_DE' (in `sh'). They could even do
+this from their `.login' or `.profile' file.
+
+\1f
+File: gettext.info, Node: Programmers, Next: Translators, Prev: Users, Up: Top
+
+The Programmer's View
+*********************
+
+ One aim of the current message catalog implementation provided by
+GNU `gettext' was to use the system's message catalog handling, if the
+installer wishes to do so. So we perhaps should first take a look at
+the solutions we know about. The people in the POSIX committee did not
+manage to agree on one of the semi-official standards which we'll
+describe below. In fact they couldn't agree on anything, so they
+decided only to include an example of an interface. The major Unix
+vendors are split in the usage of the two most important
+specifications: X/Open's catgets vs. Uniforum's gettext interface.
+We'll describe them both and later explain our solution of this dilemma.
+
+* Menu:
+
+* catgets:: About `catgets'
+* gettext:: About `gettext'
+* Comparison:: Comparing the two interfaces
+* Using libintl.a:: Using libintl.a in own programs
+* gettext grok:: Being a `gettext' grok
+* Temp Programmers:: Temporary Notes for the Programmers Chapter
+
\1f
File: gettext.info, Node: catgets, Next: gettext, Prev: Programmers, Up: Programmers
members could have made this interface. They never really tried to
program using this interface. It is a fast, memory-saving
implementation, an user can happily live with it. But programmers hate
-it (at least me and some others do...)
+it (at least I and some others do...)
But we must not forget one point: after all the trouble with
transfering the rights on Unix(tm) they at last came to X/Open, the
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
+Of course here also a unique key is needed, but this key is the message
itself (how long or short it is). See *Note Comparison:: for a more
detailed comparison of the two methods.
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,
+function returns 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
(*note Special cases::). One usually defines `gettext_noop' as a no-op
macro. So you should consider the following code for your project:
- #define gettext_noop(String) (String)
+ #define gettext_noop(String) String
#define N_(String) gettext_noop (String)
`N_' is a short form similar to `_'. The `Makefile' in the `po/'
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 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.
-
\1f
File: gettext.info, Node: gettext grok, Next: Temp Programmers, Prev: Using libintl.a, Up: Programmers
* Organization:: Organization
* Information Flow:: Information Flow
-\1f
-File: gettext.info, Node: Trans Intro 0, Next: Trans Intro 1, Prev: Translators, Up: Translators
-
-Introduction 0
-==============
-
- Free software is going international! The Translation Project is a
-way to get maintainers, translators and users all together, so free
-software will gradually become able to speak many native languages.
-
- The GNU `gettext' tool set contains _everything_ maintainers need
-for internationalizing their packages for messages. It also contains
-quite useful tools for helping translators at localizing messages to
-their native language, once a package has already been
-internationalized.
-
- To achieve the Translation Project, we need many interested people
-who like their own language and write it well, and who are also able to
-synergize with other translators speaking the same language. If you'd
-like to volunteer to _work_ at translating messages, please send mail
-to your translating team.
-
- Each team has its own mailing list, courtesy of Linux International.
-You may reach your translating team at the address `LL@li.org',
-replacing LL by the two-letter ISO 639 code for your language.
-Language codes are _not_ the same as country codes given in ISO 3166.
-The following translating teams exist:
-
- Chinese `zh', Czech `cs', Danish `da', Dutch `nl', Esperanto `eo',
- Finnish `fi', French `fr', Irish `ga', German `de', Greek `el',
- Italian `it', Japanese `ja', Indonesian `in', Norwegian `no',
- Polish `pl', Portuguese `pt', Russian `ru', Spanish `es', Swedish
- `sv' and Turkish `tr'.
-
-For example, you may reach the Chinese translating team by writing to
-`zh@li.org'. When you become a member of the translating team for your
-own language, you may subscribe to its list. For example, Swedish
-people can send a message to `sv-request@li.org', having this message
-body:
-
- subscribe
-
- Keep in mind that team members should be interested in _working_ at
-translations, or at solving translational difficulties, rather than
-merely lurking around. If your team does not exist yet and you want to
-start one, please write to `translation@iro.umontreal.ca'; you will
-then reach the coordinator for all translator teams.
-
- A handful of GNU packages have already been adapted and provided
-with message translations for several languages. Translation teams
-have begun to organize, using these packages as a starting point. But
-there are many more packages and many languages for which we have no
-volunteer translators. If you would like to volunteer to work at
-translating messages, please send mail to
-`translation@iro.umontreal.ca' indicating what language(s) you can work
-on.
-
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
versions, except that this permission notice may be stated in a
translation approved by the Foundation.
+\1f
+File: gettext.info, Node: Trans Intro 0, Next: Trans Intro 1, Prev: Translators, Up: Translators
+
+Introduction 0
+==============
+
+ Free software is going international! The Translation Project is a
+way to get maintainers, translators and users all together, so free
+software will gradually become able to speak many native languages.
+
+ The GNU `gettext' tool set contains _everything_ maintainers need
+for internationalizing their packages for messages. It also contains
+quite useful tools for helping translators at localizing messages to
+their native language, once a package has already been
+internationalized.
+
+ To achieve the Translation Project, we need many interested people
+who like their own language and write it well, and who are also able to
+synergize with other translators speaking the same language. If you'd
+like to volunteer to _work_ at translating messages, please send mail
+to your translating team.
+
+ Each team has its own mailing list, courtesy of Linux International.
+You may reach your translating team at the address `LL@li.org',
+replacing LL by the two-letter ISO 639 code for your language.
+Language codes are _not_ the same as country codes given in ISO 3166.
+The following translating teams exist:
+
+ Chinese `zh', Czech `cs', Danish `da', Dutch `nl', Esperanto `eo',
+ Finnish `fi', French `fr', Irish `ga', German `de', Greek `el',
+ Italian `it', Japanese `ja', Indonesian `in', Norwegian `no',
+ Polish `pl', Portuguese `pt', Russian `ru', Spanish `es', Swedish
+ `sv' and Turkish `tr'.
+
+For example, you may reach the Chinese translating team by writing to
+`zh@li.org'. When you become a member of the translating team for your
+own language, you may subscribe to its list. For example, Swedish
+people can send a message to `sv-request@li.org', having this message
+body:
+
+ subscribe
+
+ Keep in mind that team members should be interested in _working_ at
+translations, or at solving translational difficulties, rather than
+merely lurking around. If your team does not exist yet and you want to
+start one, please write to `translation@iro.umontreal.ca'; you will
+then reach the coordinator for all translator teams.
+
+ A handful of GNU packages have already been adapted and provided
+with message translations for several languages. Translation teams
+have begun to organize, using these packages as a starting point. But
+there are many more packages and many languages for which we have no
+volunteer translators. If you would like to volunteer to work at
+translating messages, please send mail to
+`translation@iro.umontreal.ca' indicating what language(s) you can work
+on.
+
\1f
File: gettext.info, Node: Trans Intro 1, Next: Discussions, Prev: Trans Intro 0, Up: Translators
* Prerequisites:: Prerequisite Works
* gettextize Invocation:: Invoking the `gettextize' Program
* Adjusting Files:: Files You Must Create or Alter
+* autoconf macros:: Autoconf macros for use in `configure.in'
\1f
File: gettext.info, Node: Flat and Non-Flat, Next: Prerequisites, Prev: Maintainers, Up: Maintainers
of the appropriate translating teams of the Translation Project (forward
the submission to `translation@iro.umontreal.ca' in case of doubt), to
ensure that the PO file format is not severely broken and does not
-prevent successful installation, and for the rest, to merely to put
-these PO files in `po/' for distribution.
+prevent successful installation, and for the rest, to merely put these
+PO files in `po/' for distribution.
As a maintainer, you do not have to take on your shoulders the
responsibility of checking if the translations are adequate or
Maintainers should _never ever_ apply PO file bug reports
themselves, short-cutting translation teams. If some translator has
difficulty to get some of her points through her team, it should not be
-an issue for her to directly negotiate translations with maintainers.
+an option for her to directly negotiate translations with maintainers.
Teams ought to settle their problems themselves, if any. If you, as a
maintainer, ever think there is a real problem with a team, please
never try to _solve_ a team's problem on your own.
`AM_GNU_GETTEXT([external])', and internationalization will not be
enabled on systems lacking GNU gettext.
-`-h'
+`--no-changelog'
+ Don't update or create ChangeLog files. By default, `gettextize'
+ logs all changes (file additions, modifications ans removals) in a
+ file called `ChangeLog' in each affected directory.
+
`--help'
Display this help and exit.
option `--force' (`-f') is given, the `intl/' directory is emptied
first.
+ 4. The `config.rpath' file is copied into the directory containing
+ configuration support files. It is needed by the `AM_GNU_GETTEXT'
+ autoconf macro.
+
If your site support symbolic links, `gettextize' will not actually
copy the files into your package, but establish symbolic links instead.
so it can be identical in all packages.
\1f
-File: gettext.info, Node: Adjusting Files, Prev: gettextize Invocation, Up: Maintainers
+File: gettext.info, Node: Adjusting Files, Next: autoconf macros, Prev: gettextize Invocation, Up: Maintainers
Files You Must Create or Alter
==============================
So, here comes a list of files, each one followed by a description of
all alterations it needs. Many examples are taken out from the GNU
-`gettext' 0.11-pre2 distribution itself. You may indeed refer to the
-source code of the GNU `gettext' package, as it is intended to be a
-good example and master implementation for using its own functionality.
+`gettext' 0.11 distribution itself, or from the GNU `hello'
+distribution (`http://www.franken.de/users/gnu/ke/hello' or
+`http://www.gnu.franken.de/ke/hello/') You may indeed refer to the
+source code of the GNU `gettext' and GNU `hello' packages, as they are
+intended to be good examples for using GNU gettext functionality.
* Menu:
* acconfig:: `acconfig.h' at top level
* Makefile:: `Makefile.in' at top level
* src/Makefile:: `Makefile.in' in `src/'
+* lib/gettext.h:: `gettext.h' in `lib/'
\1f
File: gettext.info, Node: po/POTFILES.in, Next: po/LINGUAS, Prev: Adjusting Files, Up: Adjusting Files
This is done by a set of lines like these:
PACKAGE=gettext
- VERSION=0.11-pre2
+ VERSION=0.11
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
Of course, you replace `gettext' with the name of your package,
- and `0.11-pre2' by its version numbers, exactly as they should
- appear in the packaged `tar' file name of your distribution
- (`gettext-0.11-pre2.tar.gz', here).
+ and `0.11' by its version numbers, exactly as they should appear
+ in the packaged `tar' file name of your distribution
+ (`gettext-0.11.tar.gz', here).
2. Check for internationalization support.
If you do not have an `aclocal.m4' file in your distribution, the
simplest is to concatenate the files `codeset.m4', `gettext.m4',
-`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `progtest.m4'
-from GNU `gettext''s `m4/' directory into a single file. If you have
-suppressed the `intl/' directory, only `gettext.m4', `iconv.m4',
-`progtest.m4' need to be concatenated.
+`glibc21.m4', `iconv.m4', `isc-posix.m4', `lcmessage.m4', `lib-ld.m4',
+`lib-link.m4', `lib-prefix.m4', `progtest.m4' from GNU `gettext''s
+`m4/' directory into a single file. If you have suppressed the `intl/'
+directory, only `gettext.m4', `iconv.m4', `progtest.m4' need to be
+concatenated.
If you already have an `aclocal.m4' file, then you will have to
merge the said macro files into your `aclocal.m4'. Note that if you
example, we also define `SUBDIRS' in `Makefile.in' for it to be
further used in the `dist:' goal.
- SUBDIRS = doc intl lib src @POSUB@
+ SUBDIRS = doc intl lib src po
Note that you must arrange for `make' to descend into the `intl'
directory before descending into other directories containing code
\1f
-File: gettext.info, Node: src/Makefile, Prev: Makefile, Up: Adjusting Files
+File: gettext.info, Node: src/Makefile, Next: lib/gettext.h, Prev: Makefile, Up: Adjusting Files
`Makefile.in' in `src/'
-----------------------
Note that `@datadir@' defaults to `$(prefix)/share', thus
`$(localedir)' defaults to `$(prefix)/share/locale'.
- 5. You should ensure that the final linking will use `@INTLLIBS@' as
- a library. An easy way to achieve this is to manage that it gets
- into `LIBS', like this:
+ 5. You should ensure that the final linking will use `@LIBINTL@' or
+ `@LTLIBINTL@' as a library. `@LIBINTL@' is for use without
+ `libtool', `@LTLIBINTL@' is for use with `libtool'. An easy way to
+ achieve this is to manage that it gets into `LIBS', like this:
- LIBS = @INTLLIBS@ @LIBS@
+ LIBS = @LIBINTL@ @LIBS@
In most packages internationalized with GNU `gettext', one will
find a directory `lib/' in which a library containing some helper
the functions in the `lib/' also give messages to the user which
of course should be translated, too. Taking care of this, the
support library (say `libsupport.a') should be placed before
- `@INTLLIBS@' and `@LIBS@' in the above example. So one has to
+ `@LIBINTL@' and `@LIBS@' in the above example. So one has to
write this:
- LIBS = ../lib/libsupport.a @INTLLIBS@ @LIBS@
+ LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@
6. You should also ensure that directory `intl/' will be searched for
C preprocessor include files in all circumstances. So, you have to
\1f
-File: gettext.info, Node: Programming Languages, Next: Conclusion, Prev: Maintainers, Up: Top
+File: gettext.info, Node: lib/gettext.h, Prev: src/Makefile, Up: Adjusting Files
-Other Programming Languages
-***************************
+`gettext.h' in `lib/'
+---------------------
- While the presentation of `gettext' focuses mostly on C and
-implicitly applies to C++ as well, its scope is far broader than that:
-Many programming languages, scripting languages and other textual data
-like GUI resources or package descriptions can make use of the gettext
-approach.
+ Internationalization of packages, as provided by GNU `gettext', is
+optional. It can be turned off in two situations:
-* Menu:
+ * When the installer has specified `./configure --disable-nls'. This
+ can be useful when small binaries are more important than
+ features, for example when building utilities for boot diskettes.
+ It can also be useful in order to get some specific C compiler
+ warnings about code quality with some older versions of GCC (older
+ than 3.0).
-* Language Implementors:: The Language Implementor's View
-* Programmers for other Languages:: The Programmer's View
-* Translators for other Languages:: The Translator's View
-* List of Programming Languages:: Individual Programming Languages
-* List of Data Formats:: Internationalizable Data
+ * When the package does not include the `intl/' subdirectory, and the
+ libintl.h header (with its associated libintl library, if any) is
+ not already installed on the system, it is preferrable that the
+ package builds without internationalization support, rather than
+ to give a compilation error.
-\1f
-File: gettext.info, Node: Language Implementors, Next: Programmers for other Languages, Prev: Programming Languages, Up: Programming Languages
-
-The Language Implementor's View
-===============================
-
- All programming and scripting languages that have the notion of
-strings are eligible to supporting `gettext'. Supporting `gettext'
-means the following:
-
- 1. You should add to the language a syntax for translatable strings.
- In principle, a function call of `gettext' would do, but a
- shorthand syntax helps keeping the legibility of internationalized
- programs. For example, in C we use the syntax `_("string")', in
- bash we use the syntax `$"string"', and in GNU awk we use the
- shorthand `_"string"'.
-
- 2. You should arrange that evaluation of such a translatable string at
- runtime calls the `gettext' function, or performs equivalent
- processing.
-
- 3. Similarly, you should make the functions `ngettext', `dcgettext',
- `dcngettext' available from within the language. These functions
- are less often used, but are nevertheless necessary for particular
- purposes: `ngettext' for correct plural handling, and `dcgettext'
- and `dcngettext' for obeying other locale environment variables
- than `LC_MESSAGES', such as `LC_TIME' or `LC_MONETARY'. For these
- latter functions, you need to make the `LC_*' constants, available
- in the C header `<locale.h>', referenceable from within the
- language, usually either as enumeration values or as strings.
-
- 4. You should allow the programmer to designate a message domain,
- either by making the `textdomain' function available from within
- the language, or by introducing a magic variable called
- `TEXTDOMAIN'. Similarly, you should allow the programmer to
- designate where to search for message catalogs, by providing
- access to the `bindtextdomain' function.
-
- 5. You should either perform a `setlocale (LC_ALL, "")' call during
- the startup of your language runtime, or allow the programmer to
- do so. Remember that gettext will act as a no-op if the
- `LC_MESSAGES' and `LC_CTYPE' locale facets are not both set.
-
- 6. A programmer should have a way to extract translatable strings
- from a program into a PO file. The GNU `xgettext' program is being
- extended to support very different programming languages. Please
- contact the GNU `gettext' maintainers to help them doing this. If
- the string extractor is best integrated into your language's
- parser, GNU `xgettext' can function as a front end to your string
- extractor.
-
- 7. The language's library should have a string formatting facility
- where the arguments of a format string are denoted by a positional
- number or a name. This is needed because for some languages and
- some messages with more than one substitutable argument, the
- translation will need to output the substituted arguments in
- different order. *Note c-format::.
-
- 8. If the language has more than one implementation, and not all of
- the implementations use `gettext', but the programs should be
- portable across implementations, you should provide a no-i18n
- emulation, that makes the other implementations accept programs
- written for yours, without actually translating the strings.
-
- 9. To help the programmer in the task of marking translatable strings,
- which is usually performed using the Emacs PO mode, you are
- welcome to contact the GNU `gettext' maintainers, so they can add
- support for your language to `po-mode.el'.
-
- On the implementation side, three approaches are possible, with
-different effects on portability and copyright:
-
- * You may integrate the GNU `gettext''s `intl/' directory in your
- package, as described in *Note Maintainers::. This allows you to
- have internationalization on all kinds of platforms. Note that
- when you then distribute your package, it legally falls under the
- GNU General Public License, and the GNU project will be glad about
- your contribution to the Free Software pool.
-
- * You may link against GNU `gettext' functions if they are found in
- the C library. For example, an autoconf test for `gettext()' and
- `ngettext()' will detect this situation. For the moment, this test
- will succeed on GNU systems and not on other platforms. No severe
- copyright restrictions apply.
-
- * You may emulate or reimplement the GNU `gettext' functionality.
- This has the advantage of full portability and no copyright
- restrictions, but also the drawback that you have to reimplement
- the GNU `gettext' features (such as the `LANGUAGE' environment
- variable, the locale aliases database, the automatic charset
- conversion, and plural handling).
+ A C preprocessor macro can be used to detect these two cases.
+Usually, when `libintl.h' was found and not explicitly disabled, the
+`ENABLE_NLS' macro will be defined to 1 in the autoconf generated
+configuration file (usually called `config.h'). In the two negative
+situations, however, this macro will not be defined, thus it will
+evaluate to 0 in C preprocessor expressions.
-\1f
-File: gettext.info, Node: Programmers for other Languages, Next: Translators for other Languages, Prev: Language Implementors, Up: Programming Languages
+ `gettext.h' is a convenience header file for conditional use of
+`<libintl.h>', depending on the `ENABLE_NLS' macro. If `ENABLE_NLS' is
+set, it includes `<libintl.h>'; otherwise it defines no-op substitutes
+for the libintl.h functions. We recommend the use of `"gettext.h"' over
+direct use of `<libintl.h>', so that portability to older systems is
+guaranteed and installers can turn off internationalization if they
+want to. In the C code, you will then write
+
+ #include "gettext.h"
+
+instead of
-The Programmer's View
-=====================
+ #include <libintl.h>
- For the programmer, the general procedure is the same as for the C
-language. The Emacs PO mode supports other languages, and the GNU
-`xgettext' string extractor recognizes other languages based on the
-file extension or a command-line option. In some languages,
-`setlocale' is not needed because it is already performed by the
-underlying language runtime.
+ The location of `gettext.h' is usually in a directory containing
+auxiliary include files. In many GNU packages, there is a directory
+`lib/' containing helper functions; `gettext.h' fits there. In other
+packages, it can go into the `src' directory.
+
+ Do not install the `gettext.h' file in public locations. Every
+package that needs it should contain a copy of it on its own.
\1f
-File: gettext.info, Node: Translators for other Languages, Next: List of Programming Languages, Prev: Programmers for other Languages, Up: Programming Languages
+File: gettext.info, Node: autoconf macros, Prev: Adjusting Files, Up: Maintainers
+
+Autoconf macros for use in `configure.in'
+=========================================
-The Translator's View
-=====================
+ GNU `gettext' installs macros for use in a package's `configure.in'
+or `configure.ac'. *Note Introduction: (autoconf)Top. The primary
+macro is, of course, `AM_GNU_GETTEXT'.
+
+* Menu:
- The translator works exactly as in the C language case. The only
-difference is that when translating format strings, she has to be aware
-of the language's particular syntax for positional arguments in format
-strings.
+* AM_GNU_GETTEXT:: AM_GNU_GETTEXT in `gettext.m4'
+* AM_ICONV:: AM_ICONV in `iconv.m4'
This file provides documentation for GNU `gettext' utilities. It
also serves as a reference for the free Translation Project.
- Copyright (C) 1995, 1996, 1997, 1998, 2001 Free Software Foundation,
-Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2001, 2002 Free Software
+Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
translation approved by the Foundation.
\1f
-File: gettext.info, Node: List of Programming Languages, Next: List of Data Formats, Prev: Translators for other Languages, Up: Programming Languages
+File: gettext.info, Node: AM_GNU_GETTEXT, Next: AM_ICONV, Prev: autoconf macros, Up: autoconf macros
+
+AM_GNU_GETTEXT in `gettext.m4'
+------------------------------
+
+ The `AM_GNU_GETTEXT' macro tests for the presence of the GNU gettext
+function family in either the C library or a separate `libintl' library
+(shared or static libraries are both supported) or in the package's
+`intl/' directory.
+
+ `AM_GNU_GETTEXT' accepts up to three optional arguments. The general
+syntax is
+
+ AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR])
+
+ INTLSYMBOL can be one of `external', `no-libtool', `use-libtool'.
+The default (if it is not specified or empty) is `no-libtool'.
+INTLSYMBOL should be `external' for packages with no `intl/' directory,
+and `no-libtool' or `use-libtool' for packages with an `intl/'
+directory. If INTLSYMBOL is `use-libtool', then a libtool library
+`$(top_builddir)/intl/libintl.la' will be created (shared and/or static,
+depending on `--{enable,disable}-{shared,static}' and on the presence
+of `AM_DISABLE_SHARED'). If INTLSYMBOL is `no-libtool', a static library
+`$(top_builddir)/intl/libintl.a' will be created.
+
+ If NEEDSYMBOL is specified and is `need-ngettext', then GNU gettext
+implementations (in libc or libintl) without the `ngettext()' function
+will be ignored.
+
+ INTLDIR is used to find the intl libraries. If empty, the value
+`$(top_builddir)/intl/' is used.
+
+ The `AM_GNU_GETTEXT' macro determines whether GNU gettext is
+available and should be used. If so, it sets the `USE_NLS' variable to
+`yes'; it defines `ENABLE_NLS' to 1 in the autoconf generated
+configuration file (usually called `config.h'); it sets the variables
+`LIBINTL' and `LTLIBINTL' to the linker options for use in a Makefile
+(`LIBINTL' for use without libtool, `LTLIBINTL' for use with libtool);
+it adds an `-I' option to `CPPFLAGS' if necessary. In the negative
+case, it sets `USE_NLS' to `no'; it sets `LIBINTL' and `LTLIBINTL' to
+empty and doesn't change `CPPFLAGS'.
+
+ The complexities that `AM_GNU_GETTEXT' deals with are the following:
+
+ * Some operating systems have `gettext' in the C library, for example
+ glibc. Some have it in a separate library `libintl'. GNU `libintl'
+ might have been installed as part of the GNU `gettext' package.
+
+ * GNU `libintl', if installed, is not necessarily already in the
+ search path (`CPPFLAGS' for the include file search path,
+ `LDFLAGS' for the library search path).
+
+ * Except for glibc, the operating system's native `gettext' cannot
+ exploit the GNU mo files, doesn't have the necessary locale
+ dependency features, and cannot convert messages from the
+ catalog's text encoding to the user's locale encoding.
+
+ * GNU `libintl', if installed, is not necessarily already in the run
+ time library search path. To avoid the need for setting an
+ environment variable like `LD_LIBRARY_PATH', the macro adds the
+ appropriate run time search path options to the `LIBINTL' and
+ `LTLIBINTL' variables. This works on most systems, but not on some
+ operating systems with limited shared library support, like SCO.
+
+ * GNU `libintl' relies on POSIX `iconv'. The macro checks for linker
+ options needed to use iconv and appends them to the `LIBINTL' and
+ `LTLIBINTL' variables.
+
+\1f
+File: gettext.info, Node: AM_ICONV, Prev: AM_GNU_GETTEXT, Up: autoconf macros
+
+AM_ICONV in `iconv.m4'
+----------------------
+
+ The `AM_ICONV' macro tests for the presence of the POSIX `iconv'
+function family in either the C library or a separate `libiconv'
+library. If found, it sets the `am_cv_func_iconv' variable to `yes'; it
+defines `HAVE_ICONV' to 1 in the autoconf generated configuration file
+(usually called `config.h'); it defines `ICONV_CONST' to `const' or to
+empty, depending on whether the second argument of `iconv()' is of type
+`const char **' or `char **'; it sets the variables `LIBICONV' and
+`LTLIBICONV' to the linker options for use in a Makefile (`LIBICONV'
+for use without libtool, `LTLIBICONV' for use with libtool); it adds an
+`-I' option to `CPPFLAGS' if necessary. If not found, it sets
+`LIBICONV' and `LTLIBICONV' to empty and doesn't change `CPPFLAGS'.
+
+ The complexities that `AM_ICONV' deals with are the following:
+
+ * Some operating systems have `iconv' in the C library, for example
+ glibc. Some have it in a separate library `libiconv', for example
+ OSF/1 or FreeBSD. Regardless of the operating system, GNU
+ `libiconv' might have been installed. In that case, it should be
+ used instead of the operating system's native `iconv'.
+
+ * GNU `libiconv', if installed, is not necessarily already in the
+ search path (`CPPFLAGS' for the include file search path,
+ `LDFLAGS' for the library search path).
+
+ * GNU `libiconv' is binary incompatible with some operating system's
+ native `iconv', for example on FreeBSD. Use of an `iconv.h' and
+ `libiconv.so' that don't fit together would produce program
+ crashes.
+
+ * GNU `libiconv', if installed, is not necessarily already in the
+ run time library search path. To avoid the need for setting an
+ environment variable like `LD_LIBRARY_PATH', the macro adds the
+ appropriate run time search path options to the `LIBICONV'
+ variable. This works on most systems, but not on some operating
+ systems with limited shared library support, like SCO.
+
+ `iconv.m4' is distributed with the GNU gettext package because
+`gettext.m4' relies on it.
+
+\1f
+File: gettext.info, Node: Programming Languages, Next: Conclusion, Prev: Maintainers, Up: Top
+
+Other Programming Languages
+***************************
+
+ While the presentation of `gettext' focuses mostly on C and
+implicitly applies to C++ as well, its scope is far broader than that:
+Many programming languages, scripting languages and other textual data
+like GUI resources or package descriptions can make use of the gettext
+approach.
+
+* Menu:
+
+* Language Implementors:: The Language Implementor's View
+* Programmers for other Languages:: The Programmer's View
+* Translators for other Languages:: The Translator's View
+* Maintainers for other Languages:: The Maintainer's View
+* List of Programming Languages:: Individual Programming Languages
+* List of Data Formats:: Internationalizable Data
+
+\1f
+File: gettext.info, Node: Language Implementors, Next: Programmers for other Languages, Prev: Programming Languages, Up: Programming Languages
+
+The Language Implementor's View
+===============================
+
+ All programming and scripting languages that have the notion of
+strings are eligible to supporting `gettext'. Supporting `gettext'
+means the following:
+
+ 1. You should add to the language a syntax for translatable strings.
+ In principle, a function call of `gettext' would do, but a
+ shorthand syntax helps keeping the legibility of internationalized
+ programs. For example, in C we use the syntax `_("string")', in
+ bash we use the syntax `$"string"', and in GNU awk we use the
+ shorthand `_"string"'.
+
+ 2. You should arrange that evaluation of such a translatable string at
+ runtime calls the `gettext' function, or performs equivalent
+ processing.
+
+ 3. Similarly, you should make the functions `ngettext', `dcgettext',
+ `dcngettext' available from within the language. These functions
+ are less often used, but are nevertheless necessary for particular
+ purposes: `ngettext' for correct plural handling, and `dcgettext'
+ and `dcngettext' for obeying other locale environment variables
+ than `LC_MESSAGES', such as `LC_TIME' or `LC_MONETARY'. For these
+ latter functions, you need to make the `LC_*' constants, available
+ in the C header `<locale.h>', referenceable from within the
+ language, usually either as enumeration values or as strings.
+
+ 4. You should allow the programmer to designate a message domain,
+ either by making the `textdomain' function available from within
+ the language, or by introducing a magic variable called
+ `TEXTDOMAIN'. Similarly, you should allow the programmer to
+ designate where to search for message catalogs, by providing
+ access to the `bindtextdomain' function.
+
+ 5. You should either perform a `setlocale (LC_ALL, "")' call during
+ the startup of your language runtime, or allow the programmer to
+ do so. Remember that gettext will act as a no-op if the
+ `LC_MESSAGES' and `LC_CTYPE' locale facets are not both set.
+
+ 6. A programmer should have a way to extract translatable strings
+ from a program into a PO file. The GNU `xgettext' program is being
+ extended to support very different programming languages. Please
+ contact the GNU `gettext' maintainers to help them doing this. If
+ the string extractor is best integrated into your language's
+ parser, GNU `xgettext' can function as a front end to your string
+ extractor.
+
+ 7. The language's library should have a string formatting facility
+ where the arguments of a format string are denoted by a positional
+ number or a name. This is needed because for some languages and
+ some messages with more than one substitutable argument, the
+ translation will need to output the substituted arguments in
+ different order. *Note c-format::.
+
+ 8. If the language has more than one implementation, and not all of
+ the implementations use `gettext', but the programs should be
+ portable across implementations, you should provide a no-i18n
+ emulation, that makes the other implementations accept programs
+ written for yours, without actually translating the strings.
+
+ 9. To help the programmer in the task of marking translatable strings,
+ which is usually performed using the Emacs PO mode, you are
+ welcome to contact the GNU `gettext' maintainers, so they can add
+ support for your language to `po-mode.el'.
+
+ On the implementation side, three approaches are possible, with
+different effects on portability and copyright:
+
+ * You may integrate the GNU `gettext''s `intl/' directory in your
+ package, as described in *Note Maintainers::. This allows you to
+ have internationalization on all kinds of platforms. Note that
+ when you then distribute your package, it legally falls under the
+ GNU General Public License, and the GNU project will be glad about
+ your contribution to the Free Software pool.
+
+ * You may link against GNU `gettext' functions if they are found in
+ the C library. For example, an autoconf test for `gettext()' and
+ `ngettext()' will detect this situation. For the moment, this test
+ will succeed on GNU systems and not on other platforms. No severe
+ copyright restrictions apply.
+
+ * You may emulate or reimplement the GNU `gettext' functionality.
+ This has the advantage of full portability and no copyright
+ restrictions, but also the drawback that you have to reimplement
+ the GNU `gettext' features (such as the `LANGUAGE' environment
+ variable, the locale aliases database, the automatic charset
+ conversion, and plural handling).
+
+\1f
+File: gettext.info, Node: Programmers for other Languages, Next: Translators for other Languages, Prev: Language Implementors, Up: Programming Languages
+
+The Programmer's View
+=====================
+
+ For the programmer, the general procedure is the same as for the C
+language. The Emacs PO mode supports other languages, and the GNU
+`xgettext' string extractor recognizes other languages based on the
+file extension or a command-line option. In some languages,
+`setlocale' is not needed because it is already performed by the
+underlying language runtime.
+
+\1f
+File: gettext.info, Node: Translators for other Languages, Next: Maintainers for other Languages, Prev: Programmers for other Languages, Up: Programming Languages
+
+The Translator's View
+=====================
+
+ The translator works exactly as in the C language case. The only
+difference is that when translating format strings, she has to be aware
+of the language's particular syntax for positional arguments in format
+strings.
+
+\1f
+File: gettext.info, Node: Maintainers for other Languages, Next: List of Programming Languages, Prev: Translators for other Languages, Up: Programming Languages
+
+The Maintainer's View
+=====================
+
+ For the maintainer, the general procedure differs from the C language
+case in two ways.
+
+ * For those languages that don't use GNU gettext, the `intl/'
+ directory is not needed and can be omitted. This means that the
+ maintainer calls the `gettextize' program without the `--intl'
+ option, and that he invokes the `AM_GNU_GETTEXT' autoconf macro via
+ `AM_GNU_GETTEXT([external])'.
+
+ * If only a single programming language is used, the
+ `XGETTEXT_OPTIONS' variable in `po/Makevars' (*note po/Makevars::)
+ should be adjusted to match the `xgettext' options for that
+ particular programming language. If the package uses more than
+ one programming language with `gettext' support, it becomes
+ necessary to change the POT file construction rule in
+ `po/Makefile.in.in'. It is recommended to make one `xgettext'
+ invocation per programming language, each with the options
+ appropriate for that language, and to combine the resulting files
+ using `msgcat'.
+
+\1f
+File: gettext.info, Node: List of Programming Languages, Next: List of Data Formats, Prev: Maintainers for other Languages, Up: Programming Languages
Individual Programming Languages
================================
use
Extractor
- `clisp-xgettext'
+ `xgettext -k_ -kENGLISH'
Formatting with positions
`format "~1@*~D ~0@*~D"'
use
Extractor
- xpot
+ `xgettext'
Formatting with positions
`format "%2$d %1$d"'
------
RPMs
- librep
+ librep 0.15.3 or newer
File extension
`jl'
use
Extractor
- `rep-xgettext'
+ `xgettext'
Formatting with positions
`format "%2$d %1$d"'
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 1 Introduction</TITLE>
</HEAD>
other English specific habits, and connected to generic ways of doing
the same, instead. Program developers may use various techniques to
internationalize their programs. Some of these have been standardized.
-GNU <CODE>gettext</CODE> offers one of these standards. See section <A HREF="gettext_10.html#SEC135">10 The Programmer's View</A>.
+GNU <CODE>gettext</CODE> offers one of these standards. See section <A HREF="gettext_10.html#SEC138">10 The Programmer's View</A>.
</P>
<P>
<P>
The following diagram summarizes the relation between the files
handled by GNU <CODE>gettext</CODE> and the tools acting on these files.
-It is followed by a somewhat detailed explanations, which you should
+It is followed by somewhat detailed explanations, which you should
read while keeping an eye on the diagram. Having a clear understanding
-of these interrelations would surely help programmers, translators
+of these interrelations will surely help programmers, translators
and maintainers.
</P>
<PRE>
#define _(String) (String)
-#define N_(String) (String)
+#define N_(String) String
#define textdomain(Domain)
#define bindtextdomain(Package, Directory)
</PRE>
<PRE>
#include <libintl.h>
#define _(String) gettext (String)
-#define gettext_noop(String) (String)
+#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
</PRE>
See section <A HREF="gettext_4.html#SEC20">4.1 Invoking the <CODE>xgettext</CODE> Program</A>, for more details about how one calls the
<CODE>xgettext</CODE> program. If you are <EM>really</EM> lazy, you might
be interested at working a lot more right away, and preparing the
-whole distribution setup (see section <A HREF="gettext_12.html#SEC166">12 The Maintainer's View</A>). By doing so, you
+whole distribution setup (see section <A HREF="gettext_12.html#SEC169">12 The Maintainer's View</A>). By doing so, you
spare yourself typing the <CODE>xgettext</CODE> command, as <CODE>make</CODE>
should now generate the proper things automatically for you!
itself is a whole matter, still exclusively meant for humans,
and whose complexity far overwhelms the level of this manual.
Nevertheless, a few hints are given in some other chapter of this
-manual (see section <A HREF="gettext_11.html#SEC155">11 The Translator's View</A>). You will also find there indications
+manual (see section <A HREF="gettext_11.html#SEC158">11 The Translator's View</A>). You will also find there indications
about how to contact translating teams, or becoming part of them,
for sharing your translating concerns with others who target the same
native language.
They just do their job the best they can. For the Translation
Project to work smoothly, it is important that maintainers do not
carry translation concerns on their already loaded shoulders, and that
-translators be kept as free as possible of programmatic concerns.
+translators be kept as free as possible of programming concerns.
</P>
<P>
Translation Project, or will give a hard time to other participants! In
particular, maintainers should relax and include all available official
PO files in their distributions, even if these have not recently been
-updated, without banging or otherwise trying to exert pressure on the
-translator teams to get the job done. The pressure should rather come
+updated, without exerting pressure on the translator teams to get the
+job done. The pressure should rather come
from the community of users speaking a particular language, and
maintainers should consider themselves fairly relieved of any concern
about the adequacy of translation files. On the other hand, translators
Once the PO file is complete and dependable, the <CODE>msgfmt</CODE> program
is used for turning the PO file into a machine-oriented format, which
may yield efficient retrieval of translations by the programs of the
-package, whenever needed at runtime (see section <A HREF="gettext_8.html#SEC130">8.3 The Format of GNU MO Files</A>). See section <A HREF="gettext_8.html#SEC115">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modalities of execution
+package, whenever needed at runtime (see section <A HREF="gettext_8.html#SEC133">8.3 The Format of GNU MO Files</A>). See section <A HREF="gettext_8.html#SEC118">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modes of execution
for the <CODE>msgfmt</CODE> program.
</P>
<CODE>make</CODE>, given a suitable <TT>`Makefile´</TT> exists for the project,
and the resulting executable is installed somewhere users will find it.
The MO files themselves should also be properly installed. Given the
-appropriate environment variables are set (see section <A HREF="gettext_9.html#SEC134">9.3 Magic for End Users</A>), the
+appropriate environment variables are set (see section <A HREF="gettext_9.html#SEC137">9.3 Magic for End Users</A>), the
program should localize itself automatically, whenever it executes.
</P>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 10 The Programmer's View</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC135" HREF="gettext_toc.html#TOC135">10 The Programmer's View</A></H1>
+<H1><A NAME="SEC138" HREF="gettext_toc.html#TOC138">10 The Programmer's View</A></H1>
<P>
One aim of the current message catalog implementation provided by
-GNU <CODE>gettext</CODE> was to use the systems message catalog handling, if the
+GNU <CODE>gettext</CODE> was to use the system's message catalog handling, if the
installer wishes to do so. So we perhaps should first take a look at
the solutions we know about. The people in the POSIX committee did not
manage to agree on one of the semi-official standards which we'll
-<H2><A NAME="SEC136" HREF="gettext_toc.html#TOC136">10.1 About <CODE>catgets</CODE></A></H2>
+<H2><A NAME="SEC139" HREF="gettext_toc.html#TOC139">10.1 About <CODE>catgets</CODE></A></H2>
<P>
The <CODE>catgets</CODE> implementation is defined in the X/Open Portability
Another, personal comment on this that only a bunch of committee members
could have made this interface. They never really tried to program
using this interface. It is a fast, memory-saving implementation, an
-user can happily live with it. But programmers hate it (at least me and
+user can happily live with it. But programmers hate it (at least I and
some others do...)
</P>
-<H3><A NAME="SEC137" HREF="gettext_toc.html#TOC137">10.1.1 The Interface</A></H3>
+<H3><A NAME="SEC140" HREF="gettext_toc.html#TOC140">10.1.1 The Interface</A></H3>
<P>
The interface to the <CODE>catgets</CODE> implementation consists of three
</P>
-<H3><A NAME="SEC138" HREF="gettext_toc.html#TOC138">10.1.2 Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
+<H3><A NAME="SEC141" HREF="gettext_toc.html#TOC141">10.1.2 Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
<P>
Now that this description seemed to be really easy -- where are the
</P>
-<H2><A NAME="SEC139" HREF="gettext_toc.html#TOC139">10.2 About <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC142" HREF="gettext_toc.html#TOC142">10.2 About <CODE>gettext</CODE></A></H2>
<P>
The definition of the <CODE>gettext</CODE> interface comes from a Uniforum
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 section <A HREF="gettext_10.html#SEC147">10.3 Comparing the Two Interfaces</A> for a more
+Of course here also a unique key is needed, but this key is the message
+itself (how long or short it is). See section <A HREF="gettext_10.html#SEC150">10.3 Comparing the Two Interfaces</A> for a more
detailed comparison of the two methods.
</P>
-<H3><A NAME="SEC140" HREF="gettext_toc.html#TOC140">10.2.1 The Interface</A></H3>
+<H3><A NAME="SEC143" HREF="gettext_toc.html#TOC143">10.2.1 The Interface</A></H3>
<P>
The minimal functionality an interface must have is a) to select a
the current global domain of the <CODE>LC_MESSAGE</CODE> category. The
argument is a null-terminated string, whose characters must be legal in
the use in filenames. If the <VAR>domain_name</VAR> argument is <CODE>NULL</CODE>,
-the function return the current value. If no value has been set
+the function returns the current value. If no value has been set
before, the name of the default domain is returned: <EM>messages</EM>.
Please note that although the return value of <CODE>textdomain</CODE> is of
type <CODE>char *</CODE> no changing is allowed. It is also important to know
</P>
-<H3><A NAME="SEC141" HREF="gettext_toc.html#TOC141">10.2.2 Solving Ambiguities</A></H3>
+<H3><A NAME="SEC144" HREF="gettext_toc.html#TOC144">10.2.2 Solving Ambiguities</A></H3>
<P>
While this single name domain works well for most applications there
</P>
-<H3><A NAME="SEC142" HREF="gettext_toc.html#TOC142">10.2.3 Locating Message Catalog Files</A></H3>
+<H3><A NAME="SEC145" HREF="gettext_toc.html#TOC145">10.2.3 Locating Message Catalog Files</A></H3>
<P>
Because many different languages for many different packages have to be
</P>
-<H3><A NAME="SEC143" HREF="gettext_toc.html#TOC143">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
+<H3><A NAME="SEC146" HREF="gettext_toc.html#TOC146">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
<P>
<CODE>gettext</CODE> not only looks up a translation in a message catalog. It
</P>
-<H3><A NAME="SEC144" HREF="gettext_toc.html#TOC144">10.2.5 Additional functions for plural forms</A></H3>
+<H3><A NAME="SEC147" HREF="gettext_toc.html#TOC147">10.2.5 Additional functions for plural forms</A></H3>
<P>
The functions of the <CODE>gettext</CODE> family described so far (and all the
-<H3><A NAME="SEC145" HREF="gettext_toc.html#TOC145">10.2.6 How to use <CODE>gettext</CODE> in GUI programs</A></H3>
+<H3><A NAME="SEC148" HREF="gettext_toc.html#TOC148">10.2.6 How to use <CODE>gettext</CODE> in GUI programs</A></H3>
<P>
One place where the <CODE>gettext</CODE> functions, if used normally, have big
</P>
-<H3><A NAME="SEC146" HREF="gettext_toc.html#TOC146">10.2.7 Optimization of the *gettext functions</A></H3>
+<H3><A NAME="SEC149" HREF="gettext_toc.html#TOC149">10.2.7 Optimization of the *gettext functions</A></H3>
<P>
At this point of the discussion we should talk about an advantage of the
</P>
-<H2><A NAME="SEC147" HREF="gettext_toc.html#TOC147">10.3 Comparing the Two Interfaces</A></H2>
+<H2><A NAME="SEC150" HREF="gettext_toc.html#TOC150">10.3 Comparing the Two Interfaces</A></H2>
<P>
The following discussion is perhaps a little bit colored. As said
</P>
<PRE>
-#define gettext_noop(String) (String)
+#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
</PRE>
<P>
<CODE>catgets</CODE> allows same original entry to have different translations,
but <CODE>gettext</CODE> has another, scalable approach for solving ambiguities
-of this kind: See section <A HREF="gettext_10.html#SEC141">10.2.2 Solving Ambiguities</A>.
+of this kind: See section <A HREF="gettext_10.html#SEC144">10.2.2 Solving Ambiguities</A>.
</P>
-<H2><A NAME="SEC148" HREF="gettext_toc.html#TOC148">10.4 Using libintl.a in own programs</A></H2>
+<H2><A NAME="SEC151" HREF="gettext_toc.html#TOC151">10.4 Using libintl.a in own programs</A></H2>
<P>
Starting with version 0.9.4 the library <CODE>libintl.h</CODE> should be
providing additional functions. The <TT>`Makefile´</TT> will put the header
and the library in directories selected using the <CODE>$(prefix)</CODE>.
-</P>
-<P>
-One exception of the above is found on HP-UX 10.01 systems. Here the C
-library does not contain the <CODE>alloca</CODE> 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
-<CODE>alloca</CODE> function in all package you use the <CODE>libintl.a</CODE> in.
-
</P>
-<H2><A NAME="SEC149" HREF="gettext_toc.html#TOC149">10.5 Being a <CODE>gettext</CODE> grok</A></H2>
+<H2><A NAME="SEC152" HREF="gettext_toc.html#TOC152">10.5 Being a <CODE>gettext</CODE> grok</A></H2>
<P>
To fully exploit the functionality of the GNU <CODE>gettext</CODE> library it
some optimization. This optimization normally prevents the calling of
the <CODE>dcgettext</CODE> function as long as no new catalog is loaded. But
if <CODE>dcgettext</CODE> is not called the program also cannot find the
-<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_10.html#SEC146">10.2.7 Optimization of the *gettext functions</A>). A
+<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_10.html#SEC149">10.2.7 Optimization of the *gettext functions</A>). A
solution for this is very easy. Include the following code in the
language switching function.
-<H2><A NAME="SEC150" HREF="gettext_toc.html#TOC150">10.6 Temporary Notes for the Programmers Chapter</A></H2>
+<H2><A NAME="SEC153" HREF="gettext_toc.html#TOC153">10.6 Temporary Notes for the Programmers Chapter</A></H2>
-<H3><A NAME="SEC151" HREF="gettext_toc.html#TOC151">10.6.1 Temporary - Two Possible Implementations</A></H3>
+<H3><A NAME="SEC154" HREF="gettext_toc.html#TOC154">10.6.1 Temporary - Two Possible Implementations</A></H3>
<P>
There are two competing methods for language independent messages:
</P>
-<H3><A NAME="SEC152" HREF="gettext_toc.html#TOC152">10.6.2 Temporary - About <CODE>catgets</CODE></A></H3>
+<H3><A NAME="SEC155" HREF="gettext_toc.html#TOC155">10.6.2 Temporary - About <CODE>catgets</CODE></A></H3>
<P>
There have been a few discussions of late on the use of
</P>
-<H3><A NAME="SEC153" HREF="gettext_toc.html#TOC153">10.6.3 Temporary - Why a single implementation</A></H3>
+<H3><A NAME="SEC156" HREF="gettext_toc.html#TOC156">10.6.3 Temporary - Why a single implementation</A></H3>
<P>
Now it seems kind of wasteful to me to have two different systems
</P>
-<H3><A NAME="SEC154" HREF="gettext_toc.html#TOC154">10.6.4 Temporary - Notes</A></H3>
+<H3><A NAME="SEC157" HREF="gettext_toc.html#TOC157">10.6.4 Temporary - Notes</A></H3>
<P>
X/Open agreed very late on the standard form so that many
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 11 The Translator's View</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC155" HREF="gettext_toc.html#TOC155">11 The Translator's View</A></H1>
+<H1><A NAME="SEC158" HREF="gettext_toc.html#TOC158">11 The Translator's View</A></H1>
-<H2><A NAME="SEC156" HREF="gettext_toc.html#TOC156">11.1 Introduction 0</A></H2>
+<H2><A NAME="SEC159" HREF="gettext_toc.html#TOC159">11.1 Introduction 0</A></H2>
<P>
Free software is going international! The Translation Project is a way
</P>
-<H2><A NAME="SEC157" HREF="gettext_toc.html#TOC157">11.2 Introduction 1</A></H2>
+<H2><A NAME="SEC160" HREF="gettext_toc.html#TOC160">11.2 Introduction 1</A></H2>
<P>
This is now official, GNU is going international! Here is the
</P>
-<H2><A NAME="SEC158" HREF="gettext_toc.html#TOC158">11.3 Discussions</A></H2>
+<H2><A NAME="SEC161" HREF="gettext_toc.html#TOC161">11.3 Discussions</A></H2>
<P>
Facing this internationalization effort, a few users expressed their
-<H2><A NAME="SEC159" HREF="gettext_toc.html#TOC159">11.4 Organization</A></H2>
+<H2><A NAME="SEC162" HREF="gettext_toc.html#TOC162">11.4 Organization</A></H2>
<P>
On a larger scale, the true solution would be to organize some kind of
-<H3><A NAME="SEC160" HREF="gettext_toc.html#TOC160">11.4.1 Central Coordination</A></H3>
+<H3><A NAME="SEC163" HREF="gettext_toc.html#TOC163">11.4.1 Central Coordination</A></H3>
<P>
I also think GNU will need sooner than it thinks, that someone setup
</P>
-<H3><A NAME="SEC161" HREF="gettext_toc.html#TOC161">11.4.2 National Teams</A></H3>
+<H3><A NAME="SEC164" HREF="gettext_toc.html#TOC164">11.4.2 National Teams</A></H3>
<P>
I suggest we look for volunteer coordinators/editors for individual
-<H4><A NAME="SEC162" HREF="gettext_toc.html#TOC162">11.4.2.1 Sub-Cultures</A></H4>
+<H4><A NAME="SEC165" HREF="gettext_toc.html#TOC165">11.4.2.1 Sub-Cultures</A></H4>
<P>
Taking French for example, there are a few sub-cultures around computers
</P>
-<H4><A NAME="SEC163" HREF="gettext_toc.html#TOC163">11.4.2.2 Organizational Ideas</A></H4>
+<H4><A NAME="SEC166" HREF="gettext_toc.html#TOC166">11.4.2.2 Organizational Ideas</A></H4>
<P>
I expect the next big changes after the official release. Please note
-<H3><A NAME="SEC164" HREF="gettext_toc.html#TOC164">11.4.3 Mailing Lists</A></H3>
+<H3><A NAME="SEC167" HREF="gettext_toc.html#TOC167">11.4.3 Mailing Lists</A></H3>
<P>
If we get any inquiries about GNU <CODE>gettext</CODE>, send them on to:
</P>
-<H2><A NAME="SEC165" HREF="gettext_toc.html#TOC165">11.5 Information Flow</A></H2>
+<H2><A NAME="SEC168" HREF="gettext_toc.html#TOC168">11.5 Information Flow</A></H2>
<P>
There will surely be some discussion about this messages after the
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 12 The Maintainer's View</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC166" HREF="gettext_toc.html#TOC166">12 The Maintainer's View</A></H1>
+<H1><A NAME="SEC169" HREF="gettext_toc.html#TOC169">12 The Maintainer's View</A></H1>
<P>
The maintainer of a package has many responsibilities. One of them
is ensuring that the package will install easily on many platforms,
-and that the magic we described earlier (see section <A HREF="gettext_9.html#SEC131">9 The User's View</A>) will work
+and that the magic we described earlier (see section <A HREF="gettext_9.html#SEC134">9 The User's View</A>) will work
for installers and end users.
</P>
-<H2><A NAME="SEC167" HREF="gettext_toc.html#TOC167">12.1 Flat or Non-Flat Directory Structures</A></H2>
+<H2><A NAME="SEC170" HREF="gettext_toc.html#TOC170">12.1 Flat or Non-Flat Directory Structures</A></H2>
<P>
Some free software packages are distributed as <CODE>tar</CODE> files which unpack
</P>
-<H2><A NAME="SEC168" HREF="gettext_toc.html#TOC168">12.2 Prerequisite Works</A></H2>
+<H2><A NAME="SEC171" HREF="gettext_toc.html#TOC171">12.2 Prerequisite Works</A></H2>
<P>
There are some works which are required for using GNU <CODE>gettext</CODE>
of the appropriate translating teams of the Translation Project (forward
the submission to <TT>`translation@iro.umontreal.ca´</TT> in case of doubt),
to ensure that the PO file format is not severely broken and does not
-prevent successful installation, and for the rest, to merely to put these
+prevent successful installation, and for the rest, to merely put these
PO files in <TT>`po/´</TT> for distribution.
</P>
Maintainers should <EM>never ever</EM> apply PO file bug reports
themselves, short-cutting translation teams. If some translator has
difficulty to get some of her points through her team, it should not be
-an issue for her to directly negotiate translations with maintainers.
+an option for her to directly negotiate translations with maintainers.
Teams ought to settle their problems themselves, if any. If you, as
a maintainer, ever think there is a real problem with a team, please
never try to <EM>solve</EM> a team's problem on your own.
</P>
-<H2><A NAME="SEC169" HREF="gettext_toc.html#TOC169">12.3 Invoking the <CODE>gettextize</CODE> Program</A></H2>
+<H2><A NAME="SEC172" HREF="gettext_toc.html#TOC172">12.3 Invoking the <CODE>gettextize</CODE> Program</A></H2>
<P>
Some files are consistently and identically needed in every package
<SAMP>`AM_GNU_GETTEXT([external])´</SAMP>, and internationalization will not
be enabled on systems lacking GNU gettext.
-<DT><SAMP>`-h´</SAMP>
+<DT><SAMP>`--no-changelog´</SAMP>
<DD>
+Don't update or create ChangeLog files. By default, <CODE>gettextize</CODE>
+logs all changes (file additions, modifications ans removals) in a
+file called <SAMP>`ChangeLog´</SAMP> in each affected directory.
+
<DT><SAMP>`--help´</SAMP>
<DD>
Display this help and exit.
distribution. Also, if option <CODE>--force</CODE> (<CODE>-f</CODE>) is given,
the <TT>`intl/´</TT> directory is emptied first.
+<LI>
+
+The <TT>`config.rpath´</TT> file is copied into the directory containing
+configuration support files. It is needed by the <CODE>AM_GNU_GETTEXT</CODE>
+autoconf macro.
+
</OL>
<P>
</P>
-<H2><A NAME="SEC170" HREF="gettext_toc.html#TOC170">12.4 Files You Must Create or Alter</A></H2>
+<H2><A NAME="SEC173" HREF="gettext_toc.html#TOC173">12.4 Files You Must Create or Alter</A></H2>
<P>
Besides files which are automatically added through <CODE>gettextize</CODE>,
<P>
So, here comes a list of files, each one followed by a description of
all alterations it needs. Many examples are taken out from the GNU
-<CODE>gettext</CODE> 0.11-pre2 distribution itself. You may indeed
-refer to the source code of the GNU <CODE>gettext</CODE> package, as it
-is intended to be a good example and master implementation for using
-its own functionality.
+<CODE>gettext</CODE> 0.11 distribution itself, or from the GNU
+<CODE>hello</CODE> distribution (<A HREF="http://www.franken.de/users/gnu/ke/hello">http://www.franken.de/users/gnu/ke/hello</A>
+or <A HREF="http://www.gnu.franken.de/ke/hello/">http://www.gnu.franken.de/ke/hello/</A>) You may indeed
+refer to the source code of the GNU <CODE>gettext</CODE> and GNU <CODE>hello</CODE>
+packages, as they are intended to be good examples for using GNU
+gettext functionality.
</P>
-<H3><A NAME="SEC171" HREF="gettext_toc.html#TOC171">12.4.1 <TT>`POTFILES.in´</TT> in <TT>`po/´</TT></A></H3>
+<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">12.4.1 <TT>`POTFILES.in´</TT> in <TT>`po/´</TT></A></H3>
<P>
The <TT>`po/´</TT> directory should receive a file named
</P>
-<H3><A NAME="SEC172" HREF="gettext_toc.html#TOC172">12.4.2 <TT>`LINGUAS´</TT> in <TT>`po/´</TT></A></H3>
+<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">12.4.2 <TT>`LINGUAS´</TT> in <TT>`po/´</TT></A></H3>
<P>
The <TT>`po/´</TT> directory should also receive a file named
want to further restrict, at installation time, the set of installed
languages, this should not be done by modifying the <TT>`LINGUAS´</TT> file,
but rather by using the <CODE>LINGUAS</CODE> environment variable
-(see section <A HREF="gettext_9.html#SEC133">9.2 Magic for Installers</A>).
+(see section <A HREF="gettext_9.html#SEC136">9.2 Magic for Installers</A>).
</P>
-<H3><A NAME="SEC173" HREF="gettext_toc.html#TOC173">12.4.3 <TT>`Makefile´</TT> pieces in <TT>`po/´</TT></A></H3>
+<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">12.4.3 <TT>`Makefile´</TT> pieces in <TT>`po/´</TT></A></H3>
<P>
The <TT>`po/´</TT> directory also has a file named <TT>`Makevars´</TT>.
</P>
-<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">12.4.4 <TT>`configure.in´</TT> at top level</A></H3>
+<H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">12.4.4 <TT>`configure.in´</TT> at top level</A></H3>
<P>
<TT>`configure.in´</TT> or <TT>`configure.ac´</TT> - this is the source from which
<PRE>
PACKAGE=gettext
-VERSION=0.11-pre2
+VERSION=0.11
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(PACKAGE)
</PRE>
Of course, you replace <SAMP>`gettext´</SAMP> with the name of your package,
-and <SAMP>`0.11-pre2´</SAMP> by its version numbers, exactly as they
+and <SAMP>`0.11´</SAMP> by its version numbers, exactly as they
should appear in the packaged <CODE>tar</CODE> file name of your distribution
-(<TT>`gettext-0.11-pre2.tar.gz´</TT>, here).
+(<TT>`gettext-0.11.tar.gz´</TT>, here).
<LI>Check for internationalization support.
-<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">12.4.5 <TT>`config.guess´</TT>, <TT>`config.sub´</TT> at top level</A></H3>
+<H3><A NAME="SEC178" HREF="gettext_toc.html#TOC178">12.4.5 <TT>`config.guess´</TT>, <TT>`config.sub´</TT> at top level</A></H3>
<P>
If you don't have suppressed the <TT>`intl/´</TT> subdirectory,
-<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">12.4.6 <TT>`aclocal.m4´</TT> at top level</A></H3>
+<H3><A NAME="SEC179" HREF="gettext_toc.html#TOC179">12.4.6 <TT>`aclocal.m4´</TT> at top level</A></H3>
<P>
If you do not have an <TT>`aclocal.m4´</TT> file in your distribution,
the simplest is to concatenate the files <TT>`codeset.m4´</TT>,
<TT>`gettext.m4´</TT>, <TT>`glibc21.m4´</TT>, <TT>`iconv.m4´</TT>, <TT>`isc-posix.m4´</TT>,
-<TT>`lcmessage.m4´</TT>, <TT>`progtest.m4´</TT> from GNU <CODE>gettext</CODE>'s
+<TT>`lcmessage.m4´</TT>, <TT>`lib-ld.m4´</TT>, <TT>`lib-link.m4´</TT>,
+<TT>`lib-prefix.m4´</TT>, <TT>`progtest.m4´</TT> from GNU <CODE>gettext</CODE>'s
<TT>`m4/´</TT> directory into a single file. If you have suppressed the
<TT>`intl/´</TT> directory, only <TT>`gettext.m4´</TT>, <TT>`iconv.m4´</TT>,
<TT>`progtest.m4´</TT> need to be concatenated.
</P>
-<H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">12.4.7 <TT>`acconfig.h´</TT> at top level</A></H3>
+<H3><A NAME="SEC180" HREF="gettext_toc.html#TOC180">12.4.7 <TT>`acconfig.h´</TT> at top level</A></H3>
<P>
Earlier GNU <CODE>gettext</CODE> releases required to put definitions for
</P>
-<H3><A NAME="SEC178" HREF="gettext_toc.html#TOC178">12.4.8 <TT>`Makefile.in´</TT> at top level</A></H3>
+<H3><A NAME="SEC181" HREF="gettext_toc.html#TOC181">12.4.8 <TT>`Makefile.in´</TT> at top level</A></H3>
<P>
Here are a few modifications you need to make to your main, top-level
<PRE>
-SUBDIRS = doc intl lib src @POSUB@
+SUBDIRS = doc intl lib src po
</PRE>
Note that you must arrange for <SAMP>`make´</SAMP> to descend into the
-<H3><A NAME="SEC179" HREF="gettext_toc.html#TOC179">12.4.9 <TT>`Makefile.in´</TT> in <TT>`src/´</TT></A></H3>
+<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">12.4.9 <TT>`Makefile.in´</TT> in <TT>`src/´</TT></A></H3>
<P>
Some of the modifications made in the main <TT>`Makefile.in´</TT> will
<LI>
-You should ensure that the final linking will use <CODE>@INTLLIBS@</CODE> as
-a library. An easy way to achieve this is to manage that it gets into
-<CODE>LIBS</CODE>, like this:
+You should ensure that the final linking will use <CODE>@LIBINTL@</CODE> or
+<CODE>@LTLIBINTL@</CODE> as a library. <CODE>@LIBINTL@</CODE> is for use without
+<CODE>libtool</CODE>, <CODE>@LTLIBINTL@</CODE> is for use with <CODE>libtool</CODE>. An
+easy way to achieve this is to manage that it gets into <CODE>LIBS</CODE>, like
+this:
<PRE>
-LIBS = @INTLLIBS@ @LIBS@
+LIBS = @LIBINTL@ @LIBS@
</PRE>
In most packages internationalized with GNU <CODE>gettext</CODE>, one will
GNU <CODE>gettext</CODE> Library itself needs.) However some of the functions
in the <TT>`lib/´</TT> also give messages to the user which of course should be
translated, too. Taking care of this, the support library (say
-<TT>`libsupport.a´</TT>) should be placed before <CODE>@INTLLIBS@</CODE> and
+<TT>`libsupport.a´</TT>) should be placed before <CODE>@LIBINTL@</CODE> and
<CODE>@LIBS@</CODE> in the above example. So one has to write this:
<PRE>
-LIBS = ../lib/libsupport.a @INTLLIBS@ @LIBS@
+LIBS = ../lib/libsupport.a @LIBINTL@ @LIBS@
</PRE>
<LI>
</OL>
+
+
+<H3><A NAME="SEC183" HREF="gettext_toc.html#TOC183">12.4.10 <TT>`gettext.h´</TT> in <TT>`lib/´</TT></A></H3>
+
+<P>
+Internationalization of packages, as provided by GNU <CODE>gettext</CODE>, is
+optional. It can be turned off in two situations:
+
+</P>
+
+<UL>
+<LI>
+
+When the installer has specified <SAMP>`./configure --disable-nls´</SAMP>. This
+can be useful when small binaries are more important than features, for
+example when building utilities for boot diskettes. It can also be useful
+in order to get some specific C compiler warnings about code quality with
+some older versions of GCC (older than 3.0).
+
+<LI>
+
+When the package does not include the <CODE>intl/</CODE> subdirectory, and the
+libintl.h header (with its associated libintl library, if any) is not
+already installed on the system, it is preferrable that the package builds
+without internationalization support, rather than to give a compilation
+error.
+</UL>
+
+<P>
+A C preprocessor macro can be used to detect these two cases. Usually,
+when <CODE>libintl.h</CODE> was found and not explicitly disabled, the
+<CODE>ENABLE_NLS</CODE> macro will be defined to 1 in the autoconf generated
+configuration file (usually called <TT>`config.h´</TT>). In the two negative
+situations, however, this macro will not be defined, thus it will evaluate
+to 0 in C preprocessor expressions.
+
+</P>
+<P>
+<TT>`gettext.h´</TT> is a convenience header file for conditional use of
+<TT>`<libintl.h>´</TT>, depending on the <CODE>ENABLE_NLS</CODE> macro. If
+<CODE>ENABLE_NLS</CODE> is set, it includes <TT>`<libintl.h>´</TT>; otherwise it
+defines no-op substitutes for the libintl.h functions. We recommend
+the use of <CODE>"gettext.h"</CODE> over direct use of <TT>`<libintl.h>´</TT>,
+so that portability to older systems is guaranteed and installers can
+turn off internationalization if they want to. In the C code, you will
+then write
+
+</P>
+
+<PRE>
+#include "gettext.h"
+</PRE>
+
+<P>
+instead of
+
+</P>
+
+<PRE>
+#include <libintl.h>
+</PRE>
+
+<P>
+The location of <CODE>gettext.h</CODE> is usually in a directory containing
+auxiliary include files. In many GNU packages, there is a directory
+<TT>`lib/´</TT> containing helper functions; <TT>`gettext.h´</TT> fits there.
+In other packages, it can go into the <TT>`src´</TT> directory.
+
+</P>
+<P>
+Do not install the <CODE>gettext.h</CODE> file in public locations. Every
+package that needs it should contain a copy of it on its own.
+
+</P>
+
+
+<H2><A NAME="SEC184" HREF="gettext_toc.html#TOC184">12.5 Autoconf macros for use in <TT>`configure.in´</TT></A></H2>
+
+<P>
+GNU <CODE>gettext</CODE> installs macros for use in a package's
+<TT>`configure.in´</TT> or <TT>`configure.ac´</TT>.
+See section `Introduction' in <CITE>The Autoconf Manual</CITE>.
+The primary macro is, of course, <CODE>AM_GNU_GETTEXT</CODE>.
+
+</P>
+
+
+
+<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">12.5.1 AM_GNU_GETTEXT in <TT>`gettext.m4´</TT></A></H3>
+
+<P>
+The <CODE>AM_GNU_GETTEXT</CODE> macro tests for the presence of the GNU gettext
+function family in either the C library or a separate <CODE>libintl</CODE>
+library (shared or static libraries are both supported) or in the package's
+<TT>`intl/´</TT> directory.
+
+</P>
+<P>
+<CODE>AM_GNU_GETTEXT</CODE> accepts up to three optional arguments. The general
+syntax is
+
+</P>
+
+<PRE>
+AM_GNU_GETTEXT([<VAR>intlsymbol</VAR>], [<VAR>needsymbol</VAR>], [<VAR>intldir</VAR>])
+</PRE>
+
+<P>
+<VAR>intlsymbol</VAR> can be one of <SAMP>`external´</SAMP>, <SAMP>`no-libtool´</SAMP>,
+<SAMP>`use-libtool´</SAMP>. The default (if it is not specified or empty) is
+<SAMP>`no-libtool´</SAMP>. <VAR>intlsymbol</VAR> should be <SAMP>`external´</SAMP> for packages
+with no <TT>`intl/´</TT> directory, and <SAMP>`no-libtool´</SAMP> or <SAMP>`use-libtool´</SAMP>
+for packages with an <TT>`intl/´</TT> directory. If <VAR>intlsymbol</VAR> is
+<SAMP>`use-libtool´</SAMP>, then a libtool library
+<CODE>$(top_builddir)/intl/libintl.la</CODE> will be created (shared and/or static,
+depending on <CODE>--{enable,disable}-{shared,static}</CODE> and on the
+presence of <CODE>AM_DISABLE_SHARED</CODE>). If <VAR>intlsymbol</VAR> is
+<SAMP>`no-libtool´</SAMP>, a static library
+<CODE>$(top_builddir)/intl/libintl.a</CODE> will be created.
+
+</P>
+<P>
+If <VAR>needsymbol</VAR> is specified and is <SAMP>`need-ngettext´</SAMP>, then GNU
+gettext implementations (in libc or libintl) without the <CODE>ngettext()</CODE>
+function will be ignored.
+
+</P>
+<P>
+<VAR>intldir</VAR> is used to find the intl libraries. If empty, the value
+<SAMP>`$(top_builddir)/intl/´</SAMP> is used.
+
+</P>
+<P>
+The <CODE>AM_GNU_GETTEXT</CODE> macro determines whether GNU gettext is
+available and should be used. If so, it sets the <CODE>USE_NLS</CODE> variable
+to <SAMP>`yes´</SAMP>; it defines <CODE>ENABLE_NLS</CODE> to 1 in the autoconf
+generated configuration file (usually called <TT>`config.h´</TT>); it sets
+the variables <CODE>LIBINTL</CODE> and <CODE>LTLIBINTL</CODE> to the linker options
+for use in a Makefile (<CODE>LIBINTL</CODE> for use without libtool,
+<CODE>LTLIBINTL</CODE> for use with libtool); it adds an <SAMP>`-I´</SAMP> option to
+<CODE>CPPFLAGS</CODE> if necessary. In the negative case, it sets
+<CODE>USE_NLS</CODE> to <SAMP>`no´</SAMP>; it sets <CODE>LIBINTL</CODE> and <CODE>LTLIBINTL</CODE>
+to empty and doesn't change <CODE>CPPFLAGS</CODE>.
+
+</P>
+<P>
+The complexities that <CODE>AM_GNU_GETTEXT</CODE> deals with are the following:
+
+</P>
+
+<UL>
+<LI>
+
+Some operating systems have <CODE>gettext</CODE> in the C library, for example
+glibc. Some have it in a separate library <CODE>libintl</CODE>. GNU <CODE>libintl</CODE>
+might have been installed as part of the GNU <CODE>gettext</CODE> package.
+
+<LI>
+
+GNU <CODE>libintl</CODE>, if installed, is not necessarily already in the search
+path (<CODE>CPPFLAGS</CODE> for the include file search path, <CODE>LDFLAGS</CODE> for
+the library search path).
+
+<LI>
+
+Except for glibc, the operating system's native <CODE>gettext</CODE> cannot
+exploit the GNU mo files, doesn't have the necessary locale dependency
+features, and cannot convert messages from the catalog's text encoding
+to the user's locale encoding.
+
+<LI>
+
+GNU <CODE>libintl</CODE>, if installed, is not necessarily already in the
+run time library search path. To avoid the need for setting an environment
+variable like <CODE>LD_LIBRARY_PATH</CODE>, the macro adds the appropriate
+run time search path options to the <CODE>LIBINTL</CODE> and <CODE>LTLIBINTL</CODE>
+variables. This works on most systems, but not on some operating systems
+with limited shared library support, like SCO.
+
+<LI>
+
+GNU <CODE>libintl</CODE> relies on POSIX <CODE>iconv</CODE>. The macro checks for
+linker options needed to use iconv and appends them to the <CODE>LIBINTL</CODE>
+and <CODE>LTLIBINTL</CODE> variables.
+</UL>
+
+
+
+<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">12.5.2 AM_ICONV in <TT>`iconv.m4´</TT></A></H3>
+
+<P>
+The <CODE>AM_ICONV</CODE> macro tests for the presence of the POSIX
+<CODE>iconv</CODE> function family in either the C library or a separate
+<CODE>libiconv</CODE> library. If found, it sets the <CODE>am_cv_func_iconv</CODE>
+variable to <SAMP>`yes´</SAMP>; it defines <CODE>HAVE_ICONV</CODE> to 1 in the autoconf
+generated configuration file (usually called <TT>`config.h´</TT>); it defines
+<CODE>ICONV_CONST</CODE> to <SAMP>`const´</SAMP> or to empty, depending on whether the
+second argument of <CODE>iconv()</CODE> is of type <SAMP>`const char **´</SAMP> or
+<SAMP>`char **´</SAMP>; it sets the variables <CODE>LIBICONV</CODE> and
+<CODE>LTLIBICONV</CODE> to the linker options for use in a Makefile
+(<CODE>LIBICONV</CODE> for use without libtool, <CODE>LTLIBICONV</CODE> for use with
+libtool); it adds an <SAMP>`-I´</SAMP> option to <CODE>CPPFLAGS</CODE> if
+necessary. If not found, it sets <CODE>LIBICONV</CODE> and <CODE>LTLIBICONV</CODE> to
+empty and doesn't change <CODE>CPPFLAGS</CODE>.
+
+</P>
+<P>
+The complexities that <CODE>AM_ICONV</CODE> deals with are the following:
+
+</P>
+
+<UL>
+<LI>
+
+Some operating systems have <CODE>iconv</CODE> in the C library, for example
+glibc. Some have it in a separate library <CODE>libiconv</CODE>, for example
+OSF/1 or FreeBSD. Regardless of the operating system, GNU <CODE>libiconv</CODE>
+might have been installed. In that case, it should be used instead of the
+operating system's native <CODE>iconv</CODE>.
+
+<LI>
+
+GNU <CODE>libiconv</CODE>, if installed, is not necessarily already in the search
+path (<CODE>CPPFLAGS</CODE> for the include file search path, <CODE>LDFLAGS</CODE> for
+the library search path).
+
+<LI>
+
+GNU <CODE>libiconv</CODE> is binary incompatible with some operating system's
+native <CODE>iconv</CODE>, for example on FreeBSD. Use of an <TT>`iconv.h´</TT>
+and <TT>`libiconv.so´</TT> that don't fit together would produce program
+crashes.
+
+<LI>
+
+GNU <CODE>libiconv</CODE>, if installed, is not necessarily already in the
+run time library search path. To avoid the need for setting an environment
+variable like <CODE>LD_LIBRARY_PATH</CODE>, the macro adds the appropriate
+run time search path options to the <CODE>LIBICONV</CODE> variable. This works
+on most systems, but not on some operating systems with limited shared
+library support, like SCO.
+</UL>
+
+<P>
+<TT>`iconv.m4´</TT> is distributed with the GNU gettext package because
+<TT>`gettext.m4´</TT> relies on it.
+
+</P>
<P><HR><P>
Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_11.html">previous</A>, <A HREF="gettext_13.html">next</A>, <A HREF="gettext_16.html">last</A> section, <A HREF="gettext_toc.html">table of contents</A>.
</BODY>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 13 Other Programming Languages</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC180" HREF="gettext_toc.html#TOC180">13 Other Programming Languages</A></H1>
+<H1><A NAME="SEC187" HREF="gettext_toc.html#TOC187">13 Other Programming Languages</A></H1>
<P>
While the presentation of <CODE>gettext</CODE> focuses mostly on C and
-<H2><A NAME="SEC181" HREF="gettext_toc.html#TOC181">13.1 The Language Implementor's View</A></H2>
+<H2><A NAME="SEC188" HREF="gettext_toc.html#TOC188">13.1 The Language Implementor's View</A></H2>
<P>
All programming and scripting languages that have the notion of strings
<LI>
You may integrate the GNU <CODE>gettext</CODE>'s <TT>`intl/´</TT> directory in
-your package, as described in section <A HREF="gettext_12.html#SEC166">12 The Maintainer's View</A>. This allows you to
+your package, as described in section <A HREF="gettext_12.html#SEC169">12 The Maintainer's View</A>. This allows you to
have internationalization on all kinds of platforms. Note that when you
then distribute your package, it legally falls under the GNU General
Public License, and the GNU project will be glad about your contribution
-<H2><A NAME="SEC182" HREF="gettext_toc.html#TOC182">13.2 The Programmer's View</A></H2>
+<H2><A NAME="SEC189" HREF="gettext_toc.html#TOC189">13.2 The Programmer's View</A></H2>
<P>
For the programmer, the general procedure is the same as for the C
</P>
-<H2><A NAME="SEC183" HREF="gettext_toc.html#TOC183">13.3 The Translator's View</A></H2>
+<H2><A NAME="SEC190" HREF="gettext_toc.html#TOC190">13.3 The Translator's View</A></H2>
<P>
The translator works exactly as in the C language case. The only
</P>
-<H2><A NAME="SEC184" HREF="gettext_toc.html#TOC184">13.4 Individual Programming Languages</A></H2>
+<H2><A NAME="SEC191" HREF="gettext_toc.html#TOC191">13.4 The Maintainer's View</A></H2>
+<P>
+For the maintainer, the general procedure differs from the C language
+case in two ways.
+
+</P>
+
+<UL>
+<LI>
+
+For those languages that don't use GNU gettext, the <TT>`intl/´</TT> directory
+is not needed and can be omitted. This means that the maintainer calls the
+<CODE>gettextize</CODE> program without the <SAMP>`--intl´</SAMP> option, and that he
+invokes the <CODE>AM_GNU_GETTEXT</CODE> autoconf macro via
+<SAMP>`AM_GNU_GETTEXT([external])´</SAMP>.
+
+<LI>
+
+If only a single programming language is used, the <CODE>XGETTEXT_OPTIONS</CODE>
+variable in <TT>`po/Makevars´</TT> (see section <A HREF="gettext_12.html#SEC176">12.4.3 <TT>`Makefile´</TT> pieces in <TT>`po/´</TT></A>) should be adjusted to
+match the <CODE>xgettext</CODE> options for that particular programming language.
+If the package uses more than one programming language with <CODE>gettext</CODE>
+support, it becomes necessary to change the POT file construction rule
+in <TT>`po/Makefile.in.in´</TT>. It is recommended to make one <CODE>xgettext</CODE>
+invocation per programming language, each with the options appropriate for
+that language, and to combine the resulting files using <CODE>msgcat</CODE>.
+</UL>
+
+
+
+<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">13.5 Individual Programming Languages</A></H2>
-<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">13.4.1 C, C++, Objective C</A></H3>
+
+<H3><A NAME="SEC193" HREF="gettext_toc.html#TOC193">13.5.1 C, C++, Objective C</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">13.4.2 sh - Shell Script</A></H3>
+<H3><A NAME="SEC194" HREF="gettext_toc.html#TOC194">13.5.2 sh - Shell Script</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">13.4.3 bash - Bourne-Again Shell Script</A></H3>
+<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">13.5.3 bash - Bourne-Again Shell Script</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">13.4.4 Python</A></H3>
+<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">13.5.4 Python</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">13.4.5 GNU clisp - Common Lisp</A></H3>
+<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">13.5.5 GNU clisp - Common Lisp</A></H3>
<DL COMPACT>
<DT>Extractor
<DD>
-<CODE>clisp-xgettext</CODE>
+<CODE>xgettext -k_ -kENGLISH</CODE>
<DT>Formatting with positions
<DD>
-<H3><A NAME="SEC190" HREF="gettext_toc.html#TOC190">13.4.6 GNU clisp C sources</A></H3>
+<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">13.5.6 GNU clisp C sources</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC191" HREF="gettext_toc.html#TOC191">13.4.7 Emacs Lisp</A></H3>
+<H3><A NAME="SEC199" HREF="gettext_toc.html#TOC199">13.5.7 Emacs Lisp</A></H3>
<DL COMPACT>
<DT>Extractor
<DD>
-xpot
+<CODE>xgettext</CODE>
<DT>Formatting with positions
<DD>
-<H3><A NAME="SEC192" HREF="gettext_toc.html#TOC192">13.4.8 librep</A></H3>
+<H3><A NAME="SEC200" HREF="gettext_toc.html#TOC200">13.5.8 librep</A></H3>
<DL COMPACT>
<DT>RPMs
<DD>
-librep
+librep 0.15.3 or newer
<DT>File extension
<DD>
<DT>Extractor
<DD>
-<CODE>rep-xgettext</CODE>
+<CODE>xgettext</CODE>
<DT>Formatting with positions
<DD>
-<H3><A NAME="SEC193" HREF="gettext_toc.html#TOC193">13.4.9 GNU Smalltalk</A></H3>
+<H3><A NAME="SEC201" HREF="gettext_toc.html#TOC201">13.5.9 GNU Smalltalk</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC194" HREF="gettext_toc.html#TOC194">13.4.10 Java</A></H3>
+<H3><A NAME="SEC202" HREF="gettext_toc.html#TOC202">13.5.10 Java</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">13.4.11 GNU awk</A></H3>
+<H3><A NAME="SEC203" HREF="gettext_toc.html#TOC203">13.5.11 GNU awk</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">13.4.12 Pascal - Free Pascal Compiler</A></H3>
+<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">13.5.12 Pascal - Free Pascal Compiler</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">13.4.13 wxWindows library</A></H3>
+<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">13.5.13 wxWindows library</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">13.4.14 YCP - YaST2 scripting language</A></H3>
+<H3><A NAME="SEC206" HREF="gettext_toc.html#TOC206">13.5.14 YCP - YaST2 scripting language</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC199" HREF="gettext_toc.html#TOC199">13.4.15 Perl</A></H3>
+<H3><A NAME="SEC207" HREF="gettext_toc.html#TOC207">13.5.15 Perl</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC200" HREF="gettext_toc.html#TOC200">13.4.16 PHP Hypertext Preprocessor</A></H3>
+<H3><A NAME="SEC208" HREF="gettext_toc.html#TOC208">13.5.16 PHP Hypertext Preprocessor</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC201" HREF="gettext_toc.html#TOC201">13.4.17 Pike</A></H3>
+<H3><A NAME="SEC209" HREF="gettext_toc.html#TOC209">13.5.17 Pike</A></H3>
<DL COMPACT>
-<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">13.5 Internationalizable Data</A></H2>
+<H2><A NAME="SEC210" HREF="gettext_toc.html#TOC210">13.6 Internationalizable Data</A></H2>
<P>
Here is a list of other data formats which can be internationalized
-<H3><A NAME="SEC203" HREF="gettext_toc.html#TOC203">13.5.1 POT - Portable Object Template</A></H3>
+<H3><A NAME="SEC211" HREF="gettext_toc.html#TOC211">13.6.1 POT - Portable Object Template</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">13.5.2 Resource String Table</A></H3>
+<H3><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13.6.2 Resource String Table</A></H3>
<DL COMPACT>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 14 Concluding Remarks</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC205" HREF="gettext_toc.html#TOC205">14 Concluding Remarks</A></H1>
+<H1><A NAME="SEC213" HREF="gettext_toc.html#TOC213">14 Concluding Remarks</A></H1>
<P>
We would like to conclude this GNU <CODE>gettext</CODE> manual by presenting
-<H2><A NAME="SEC206" HREF="gettext_toc.html#TOC206">14.1 History of GNU <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">14.1 History of GNU <CODE>gettext</CODE></A></H2>
<P>
Internationalization concerns and algorithms have been informally
</P>
-<H2><A NAME="SEC207" HREF="gettext_toc.html#TOC207">14.2 Related Readings</A></H2>
+<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">14.2 Related Readings</A></H2>
<P>
Eugene H. Dorr (<TT>`dorre@well.com´</TT>) maintains an interesting
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - A Language Codes</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC208" HREF="gettext_toc.html#TOC208">A Language Codes</A></H1>
+<H1><A NAME="SEC216" HREF="gettext_toc.html#TOC216">A Language Codes</A></H1>
<P>
The ISO 639 standard defines two character codes for many languages.
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - B Country Codes</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC209" HREF="gettext_toc.html#TOC209">B Country Codes</A></H1>
+<H1><A NAME="SEC217" HREF="gettext_toc.html#TOC217">B Country Codes</A></H1>
<P>
The ISO 3166 standard defines two character codes for many countries
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 2 PO Files and PO Mode Basics</TITLE>
</HEAD>
<DT><KBD>no-c-format</KBD>
<DD>
These flags should not be added by a human. Instead only the
-<CODE>xgettext</CODE> program adds them. In an automatized PO file processing
+<CODE>xgettext</CODE> program adds them. In an automated PO file processing
system as proposed here the user changes would be thrown away again as
soon as the <CODE>xgettext</CODE> program generates a new template file.
In case the <KBD>c-format</KBD> flag is given for a string the <CODE>msgfmt</CODE>
does some more tests to check to validity of the translation.
-See section <A HREF="gettext_8.html#SEC115">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>.
+See section <A HREF="gettext_8.html#SEC118">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>.
</DL>
<P>
Each of <VAR>untranslated-string</VAR> and <VAR>translated-string</VAR> respects
the C syntax for a character string, including the surrounding quotes
-and imbedded backslashed escape sequences. When the time comes
+and embedded backslashed escape sequences. When the time comes
to write multi-line strings, one should not use escaped newlines.
Instead, a closing quote should follow the last character on the
line to be continued, and an opening quote should resume the string
(<CODE>po-confirm-and-quit</CODE>) are used when the translator is done with the
PO file. The former is a bit less verbose than the latter. If the file
has been modified, it is saved to disk first. In both cases, and prior to
-all this, the commands check if some untranslated message remains in the
-PO file and, if yes, the translator is asked if she really wants to leave
+all this, the commands check if any untranslated messages remain in the
+PO file and, if so, the translator is asked if she really wants to leave
off working with this PO file. This is the preferred way of getting rid
of an Emacs PO file buffer. Merely killing it through the usual command
<KBD>C-x k</KBD> (<CODE>kill-buffer</CODE>) is not the tidiest way to proceed.
There are many different ways for encoding a particular string into a
PO file entry, because there are so many different ways to split and
quote multi-line strings, and even, to represent special characters
-by backslahsed escaped sequences. Some features of PO mode rely on
+by backslashed escaped sequences. Some features of PO mode rely on
the ability for PO mode to scan an already existing PO file for a
particular string encoded into the <CODE>msgid</CODE> field of some entry.
Even if PO mode has internally all the built-in machinery for
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 3 Preparing Program Sources</TITLE>
</HEAD>
<P>
Presuming that your set of programs, or package, has been adjusted
so all needed GNU <CODE>gettext</CODE> files are available, and your
-<TT>`Makefile´</TT> files are adjusted (see section <A HREF="gettext_12.html#SEC166">12 The Maintainer's View</A>), each C module
+<TT>`Makefile´</TT> files are adjusted (see section <A HREF="gettext_12.html#SEC169">12 The Maintainer's View</A>), each C module
having translated C strings should contain the line:
</P>
<P>
To prevent errors at runtime caused by translations the <CODE>msgfmt</CODE>
tool can check statically whether the arguments in the original and the
-translation string match in type and number. If this is not the case a
-warning will be given and the error cannot causes problems at runtime.
+translation string match in type and number. If this is not the case
+and the <SAMP>`-c´</SAMP> option has been passed to <CODE>msgfmt</CODE>, <CODE>msgfmt</CODE>
+will give an error and refuse to produce a MO file. Thus consequent
+use of <SAMP>`msgfmt -c´</SAMP> will catch the error, so that it cannot cause
+cause problems at runtime.
</P>
<P>
</P>
<PRE>
-#define gettext_noop(String) (String)
+#define gettext_noop(String) String
{
static const char *messages[] = {
</P>
<PRE>
-#define gettext_noop(String) (String)
+#define gettext_noop(String) String
{
static const char *messages[] = {
</PRE>
<P>
-But this has some drawbacks. First the programmer has to take care that
+But this has a drawback. The programmer has to take care that
he uses <CODE>gettext_noop</CODE> for the string <CODE>"a default message"</CODE>.
A use of <CODE>gettext</CODE> could have in rare cases unpredictable results.
-The second reason is found in the internals of the GNU <CODE>gettext</CODE>
-Library which will make this solution less efficient.
</P>
<P>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 4 Making the PO Template File</TITLE>
</HEAD>
two invocations of <CODE>xgettext</CODE> on the same files with the same
options at different times are guaranteed to produce the same results.
+<DT><SAMP>`--copyright-holder=<VAR>string</VAR>´</SAMP>
+<DD>
+Set the copyright holder in the output. <VAR>string</VAR> should be the
+copyright holder of the surrounding package. (Note that the msgstr
+strings, extracted from the package's sources, belong to the copyright
+holder of the package.) Translators are expected to transfer or disclaim
+the copyright for their translations, so that package maintainers can
+distribute them without legal risk. If <VAR>string</VAR> is empty, the output
+files are marked as being in the public domain; in this case, the translators
+are expected to disclaim their copyright, again so that package maintainers
+can distribute them without legal risk.
+
+The default value for <VAR>string</VAR> is the Free Software Foundation, Inc.,
+simply because <CODE>xgettext</CODE> was first used in the GNU project.
+
<DT><SAMP>`--foreign-user´</SAMP>
<DD>
-Omit FSF copyright in output. This can be useful for translators
-outside the GNU project.
+Omit FSF copyright in output. This option is equivalent to
+<SAMP>`--copyright-holder="´</SAMP>. It can be useful for packages outside the GNU
+project that want their translations to be in the public domain.
<DT><SAMP>`-m [<VAR>string</VAR>]´</SAMP>
<DD>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 5 Creating a New PO File</TITLE>
</HEAD>
Replace <SAMP>`CHARSET´</SAMP> with the character encoding used for your language,
in your locale, or UTF-8. This field is needed for correct operation of the
<CODE>msgmerge</CODE> and <CODE>msgfmt</CODE> programs, as well as for users whose
-locale's character encoding differs from yours (see section <A HREF="gettext_10.html#SEC143">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A>).
+locale's character encoding differs from yours (see section <A HREF="gettext_10.html#SEC146">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A>).
You get the character encoding of your locale by running the shell command
<SAMP>`locale charmap´</SAMP>. If the result is <SAMP>`C´</SAMP> or <SAMP>`ANSI_X3.4-1968´</SAMP>,
<DD>
This field is optional. It is only needed if the PO file has plural forms.
You can find them by searching for the <SAMP>`msgid_plural´</SAMP> keyword. The
-format of the plural forms field is described in section <A HREF="gettext_10.html#SEC144">10.2.5 Additional functions for plural forms</A>.
+format of the plural forms field is described in section <A HREF="gettext_10.html#SEC147">10.2.5 Additional functions for plural forms</A>.
</DL>
<P><HR><P>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 6 Updating Existing PO Files</TITLE>
</HEAD>
<H2><A NAME="SEC48" HREF="gettext_toc.html#TOC48">6.6 Modifying Translations</A></H2>
<P>
-PO mode prevents direct edition of the PO file, by the usual
-means Emacs give for altering a buffer's contents. By doing so,
+PO mode prevents direct modification of the PO file, by the usual
+means Emacs gives for altering a buffer's contents. By doing so,
it pretends helping the translator to avoid little clerical errors
about the overall file format, or the proper quoting of strings,
as those errors would be easily made. Other kinds of errors are
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 7 Manipulating PO Files</TITLE>
</HEAD>
dialect or orthography - for example, German as written in Switzerland
versus German as written in Germany -, she needs to apply some text
processing to every message in the catalog. The tool for doing this is
-<SAMP>`msgexec´</SAMP>.
+<SAMP>`msgfilter´</SAMP>.
</P>
<P>
-Another use of <CODE>msgexec</CODE> is to produce approximately the POT file for
+Another use of <CODE>msgfilter</CODE> is to produce approximately the POT file for
which a given PO file was made. This can be done through a filter command
-like <SAMP>`msgexec sed -e d | sed -e '/^# /d'´</SAMP>. Note that the original
+like <SAMP>`msgfilter sed -e d | sed -e '/^# /d'´</SAMP>. Note that the original
POT file may have had different comments and different plural message counts,
that's why it's better to use the original POT file if available.
+</P>
+<P>
+When a translator wants to check her translations, for example according
+to orthography rules or using a non-interactive spell checker, she can do
+so using the <SAMP>`msgexec´</SAMP> program.
+
</P>
<P>
When third party tools create PO or POT files, sometimes duplicates cannot
be avoided. But the GNU <CODE>gettext</CODE> tools give an error when they
encounter duplicate msgids in the same file and in the same domain.
-To merge duplicates, the <CODE>msguniq</CODE> program can be used.
+To merge duplicates, the <SAMP>`msguniq´</SAMP> program can be used.
</P>
<P>
<DD>
<DT><SAMP>`--location=<VAR>sourcefile</VAR>´</SAMP>
<DD>
-Select messages extracted from <VAR>sourcefile</VAR>.
+Select messages extracted from <VAR>sourcefile</VAR>. <VAR>sourcefile</VAR> can be
+either a literal file name or a wildcard pattern.
<DT><SAMP>`-M <VAR>domainname</VAR>´</SAMP>
<DD>
-<H2><A NAME="SEC79" HREF="gettext_toc.html#TOC79">7.4 Invoking the <CODE>msgexec</CODE> Program</A></H2>
+<H2><A NAME="SEC79" HREF="gettext_toc.html#TOC79">7.4 Invoking the <CODE>msgfilter</CODE> Program</A></H2>
<PRE>
-msgexec [<VAR>option</VAR>] <VAR>filter</VAR> [<VAR>filter-option</VAR>]
+msgfilter [<VAR>option</VAR>] <VAR>filter</VAR> [<VAR>filter-option</VAR>]
</PRE>
<P>
-The <CODE>msgexec</CODE> program applies a filter to all translations of a
+The <CODE>msgfilter</CODE> program applies a filter to all translations of a
translation catalog.
</P>
input and writes a modified translation to standard output. A frequently
used filter is <SAMP>`sed´</SAMP>.
+</P>
+<P>
+Note: It is your responsibility to ensure that the <VAR>filter</VAR> can cope
+with input encoded in the translation catalog's encoding. If the
+<VAR>filter</VAR> wants input in a particular encoding, you can in a first step
+convert the translation catalog to that encoding using the <SAMP>`msgconv´</SAMP>
+program, before invoking <SAMP>`msgfilter´</SAMP>. If the <VAR>filter</VAR> wants input
+in the locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+<SAMP>`msgconv´</SAMP> program and then make <SAMP>`msgfilter´</SAMP> work in an UTF-8
+locale, by using the <CODE>LC_ALL</CODE> environment variable.
+
+</P>
+<P>
+Note: Most translations in a translation catalog don't end with a newline
+character. For this reason, it is important that the <VAR>filter</VAR>
+recognizes its last input line even if it ends without a newline, and that
+it doesn't add an undesired trailing newline at the end. The <SAMP>`sed´</SAMP>
+program on some platforms is known to ignore the last line of input if it
+is not terminated with a newline. You can use GNU <CODE>sed</CODE> instead; it
+does not have this limitation.
+
</P>
<DD>
Write the .po file using indented style.
+<DT><SAMP>`--keep-header´</SAMP>
+<DD>
+Keep the header entry, i.e. the message with <SAMP>`msgid ""´</SAMP>, unmodified,
+instead of filtering it. By default, the header entry is subject to
+filtering like any other message.
+
<DT><SAMP>`--no-location´</SAMP>
<DD>
Do not write <SAMP>`#: <VAR>filename</VAR>:<VAR>line</VAR>´</SAMP> lines.
(generally created by xgettext). Untranslated entries are assigned a
translation that is identical to the msgid, and are marked fuzzy.
+</P>
+<P>
+Note: <SAMP>`msginit --no-translator --locale=en´</SAMP> performs a very similar
+task. The main difference is that <CODE>msginit</CODE> cares specially about
+the header entry, whereas <CODE>msgen</CODE> doesn't.
+
</P>
</DL>
+
+
+<H2><A NAME="SEC114" HREF="gettext_toc.html#TOC114">7.10 Invoking the <CODE>msgexec</CODE> Program</A></H2>
+
+
+<PRE>
+msgexec [<VAR>option</VAR>] <VAR>command</VAR> [<VAR>command-option</VAR>]
+</PRE>
+
+<P>
+The <CODE>msgexec</CODE> program applies a command to all translations of a
+translation catalog.
+The <VAR>command</VAR> can be any program that reads a translation from standard
+input. It is invoked once for each translation. Its output becomes
+msgexec's output. <CODE>msgexec</CODE>'s return code is the maximum return code
+across all invocations.
+
+</P>
+<P>
+A special builtin command called <SAMP>`0´</SAMP> outputs the translation, followed
+by a null byte. The output of <SAMP>`msgexec 0´</SAMP> is suitable as input for
+<SAMP>`xargs -0´</SAMP>.
+
+</P>
+<P>
+During each <VAR>command</VAR> invocation, the environment variable
+<CODE>MSGEXEC_MSGID</CODE> is bound to the message's msgid, and the environment
+variable <CODE>MSGEXEC_LOCATION</CODE> is bound to the location in the PO file
+of the message.
+
+</P>
+<P>
+Note: It is your responsibility to ensure that the <VAR>command</VAR> can cope
+with input encoded in the translation catalog's encoding. If the
+<VAR>command</VAR> wants input in a particular encoding, you can in a first step
+convert the translation catalog to that encoding using the <SAMP>`msgconv´</SAMP>
+program, before invoking <SAMP>`msgexec´</SAMP>. If the <VAR>command</VAR> wants input
+in the locale's encoding, but you want to avoid the locale's encoding, then
+you can first convert the translation catalog to UTF-8 using the
+<SAMP>`msgconv´</SAMP> program and then make <SAMP>`msgexec´</SAMP> work in an UTF-8
+locale, by using the <CODE>LC_ALL</CODE> environment variable.
+
+</P>
+
+
+<H3><A NAME="SEC115" HREF="gettext_toc.html#TOC115">7.10.1 Input file location</A></H3>
+
+<DL COMPACT>
+
+<DT><SAMP>`-i <VAR>inputfile</VAR>´</SAMP>
+<DD>
+<DT><SAMP>`--input=<VAR>inputfile</VAR>´</SAMP>
+<DD>
+Input PO file.
+
+<DT><SAMP>`-D <VAR>directory</VAR>´</SAMP>
+<DD>
+<DT><SAMP>`--directory=<VAR>directory</VAR>´</SAMP>
+<DD>
+Add <VAR>directory</VAR> to the list of directories. Source files are
+searched relative to this list of directories. The resulting <TT>`.po´</TT>
+file will be written relative to the current directory, though.
+
+</DL>
+
+<P>
+If no <VAR>inputfile</VAR> is given or if it is <SAMP>`-´</SAMP>, standard input is read.
+
+</P>
+
+
+<H3><A NAME="SEC116" HREF="gettext_toc.html#TOC116">7.10.2 Informative output</A></H3>
+
+<DL COMPACT>
+
+<DT><SAMP>`-h´</SAMP>
+<DD>
+<DT><SAMP>`--help´</SAMP>
+<DD>
+Display this help and exit.
+
+<DT><SAMP>`-V´</SAMP>
+<DD>
+<DT><SAMP>`--version´</SAMP>
+<DD>
+Output version information and exit.
+
+</DL>
+
<P><HR><P>
Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_6.html">previous</A>, <A HREF="gettext_8.html">next</A>, <A HREF="gettext_16.html">last</A> section, <A HREF="gettext_toc.html">table of contents</A>.
</BODY>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 8 Producing Binary MO Files</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC114" HREF="gettext_toc.html#TOC114">8 Producing Binary MO Files</A></H1>
+<H1><A NAME="SEC117" HREF="gettext_toc.html#TOC117">8 Producing Binary MO Files</A></H1>
-<H2><A NAME="SEC115" HREF="gettext_toc.html#TOC115">8.1 Invoking the <CODE>msgfmt</CODE> Program</A></H2>
+<H2><A NAME="SEC118" HREF="gettext_toc.html#TOC118">8.1 Invoking the <CODE>msgfmt</CODE> Program</A></H2>
<PRE>
</P>
-<H3><A NAME="SEC116" HREF="gettext_toc.html#TOC116">8.1.1 Input file location</A></H3>
+<H3><A NAME="SEC119" HREF="gettext_toc.html#TOC119">8.1.1 Input file location</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC117" HREF="gettext_toc.html#TOC117">8.1.2 Operation mode</A></H3>
+<H3><A NAME="SEC120" HREF="gettext_toc.html#TOC120">8.1.2 Operation mode</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC118" HREF="gettext_toc.html#TOC118">8.1.3 Output file location</A></H3>
+<H3><A NAME="SEC121" HREF="gettext_toc.html#TOC121">8.1.3 Output file location</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC119" HREF="gettext_toc.html#TOC119">8.1.4 Output file location in Java mode</A></H3>
+<H3><A NAME="SEC122" HREF="gettext_toc.html#TOC122">8.1.4 Output file location in Java mode</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC120" HREF="gettext_toc.html#TOC120">8.1.5 Input file interpretation</A></H3>
+<H3><A NAME="SEC123" HREF="gettext_toc.html#TOC123">8.1.5 Input file interpretation</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC121" HREF="gettext_toc.html#TOC121">8.1.6 Output details</A></H3>
+<H3><A NAME="SEC124" HREF="gettext_toc.html#TOC124">8.1.6 Output details</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC122" HREF="gettext_toc.html#TOC122">8.1.7 Informative output</A></H3>
+<H3><A NAME="SEC125" HREF="gettext_toc.html#TOC125">8.1.7 Informative output</A></H3>
<DL COMPACT>
-<H2><A NAME="SEC123" HREF="gettext_toc.html#TOC123">8.2 Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
+<H2><A NAME="SEC126" HREF="gettext_toc.html#TOC126">8.2 Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
<PRE>
</P>
-<H3><A NAME="SEC124" HREF="gettext_toc.html#TOC124">8.2.1 Operation mode</A></H3>
+<H3><A NAME="SEC127" HREF="gettext_toc.html#TOC127">8.2.1 Operation mode</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC125" HREF="gettext_toc.html#TOC125">8.2.2 Input file location</A></H3>
+<H3><A NAME="SEC128" HREF="gettext_toc.html#TOC128">8.2.2 Input file location</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC126" HREF="gettext_toc.html#TOC126">8.2.3 Input file location in Java mode</A></H3>
+<H3><A NAME="SEC129" HREF="gettext_toc.html#TOC129">8.2.3 Input file location in Java mode</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC127" HREF="gettext_toc.html#TOC127">8.2.4 Output file location</A></H3>
+<H3><A NAME="SEC130" HREF="gettext_toc.html#TOC130">8.2.4 Output file location</A></H3>
<DL COMPACT>
</P>
-<H3><A NAME="SEC128" HREF="gettext_toc.html#TOC128">8.2.5 Output details</A></H3>
+<H3><A NAME="SEC131" HREF="gettext_toc.html#TOC131">8.2.5 Output details</A></H3>
<DL COMPACT>
-<H3><A NAME="SEC129" HREF="gettext_toc.html#TOC129">8.2.6 Informative output</A></H3>
+<H3><A NAME="SEC132" HREF="gettext_toc.html#TOC132">8.2.6 Informative output</A></H3>
<DL COMPACT>
-<H2><A NAME="SEC130" HREF="gettext_toc.html#TOC130">8.3 The Format of GNU MO Files</A></H2>
+<H2><A NAME="SEC133" HREF="gettext_toc.html#TOC133">8.3 The Format of GNU MO Files</A></H2>
<P>
The format of the generated MO files is best described by a picture,
does not win <EM>that</EM> much speed. The hash table contains indices
to the sorted array of strings in the MO file. Conflict resolution is
done by double hashing. The precise hashing algorithm used is fairly
-dependent of GNU <CODE>gettext</CODE> code, and is not documented here.
+dependent on GNU <CODE>gettext</CODE> code, and is not documented here.
</P>
<P>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - 9 The User's View</TITLE>
</HEAD>
<P><HR><P>
-<H1><A NAME="SEC131" HREF="gettext_toc.html#TOC131">9 The User's View</A></H1>
+<H1><A NAME="SEC134" HREF="gettext_toc.html#TOC134">9 The User's View</A></H1>
<P>
When GNU <CODE>gettext</CODE> will truly have reached its goal, average users
-<H2><A NAME="SEC132" HREF="gettext_toc.html#TOC132">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A></H2>
+<H2><A NAME="SEC135" HREF="gettext_toc.html#TOC135">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A></H2>
<P>
Languages are not equally supported in all packages using GNU
some <TT>`<VAR>ll</VAR>.po´</TT> files, often kept together into some <TT>`po/´</TT>
directory, or for an <TT>`intl/´</TT> directory. Internationalized packages
have usually many <TT>`<VAR>ll</VAR>.po´</TT> files, where <VAR>ll</VAR> represents
-the language. section <A HREF="gettext_9.html#SEC134">9.3 Magic for End Users</A> for a complete description of the format
+the language. section <A HREF="gettext_9.html#SEC137">9.3 Magic for End Users</A> for a complete description of the format
for <VAR>ll</VAR>.
</P>
</P>
-<H2><A NAME="SEC133" HREF="gettext_toc.html#TOC133">9.2 Magic for Installers</A></H2>
+<H2><A NAME="SEC136" HREF="gettext_toc.html#TOC136">9.2 Magic for Installers</A></H2>
<P>
By default, packages fully using GNU <CODE>gettext</CODE>, internally,
</P>
-<H2><A NAME="SEC134" HREF="gettext_toc.html#TOC134">9.3 Magic for End Users</A></H2>
+<H2><A NAME="SEC137" HREF="gettext_toc.html#TOC137">9.3 Magic for End Users</A></H2>
<P>
We consider here those packages using GNU <CODE>gettext</CODE> internally,
and for which the installers did not disable translation at
<EM>configure</EM> time. Then, users only have to set the <CODE>LANG</CODE>
environment variable to the appropriate <SAMP>`<VAR>ll</VAR>_<VAR>CC</VAR>´</SAMP>
-combination prior to using the programs in the package. See section <A HREF="gettext_9.html#SEC132">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A>.
+combination prior to using the programs in the package. See section <A HREF="gettext_9.html#SEC135">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A>.
For example, let's presume a German site. At the shell prompt, users
merely have to execute <SAMP>`setenv LANG de_DE´</SAMP> (in <CODE>csh</CODE>) or
<SAMP>`export LANG; LANG=de_DE´</SAMP> (in <CODE>sh</CODE>). They could even do
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - Footnotes</TITLE>
</HEAD>
<BODY>
-<H1>GNU gettext tools, version 0.11-pre2</H1>
+<H1>GNU gettext tools, version 0.11</H1>
<H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11-pre2, 30 November 2001</H2>
+<H2>Edition 0.11, 30 January 2002</H2>
<ADDRESS>Ulrich Drepper</ADDRESS>
<ADDRESS>Jim Meyering</ADDRESS>
<ADDRESS>François Pinard</ADDRESS>
<P>Additions are welcome. Send appropriate information to
<A HREF="mailto:bug-glibc-manual@gnu.org">bug-glibc-manual@gnu.org</A>.
<P><HR><P>
-This document was generated on 30 November 2001 using the
+This document was generated on 31 January 2002 using the
<A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
translator version 1.52a.</P>
</BODY>
<HTML>
<HEAD>
<!-- This HTML file has been created by texi2html 1.52a
- from gettext.texi on 30 November 2001 -->
+ from gettext.texi on 31 January 2002 -->
<TITLE>GNU gettext utilities - Table of Contents</TITLE>
</HEAD>
<BODY>
-<H1>GNU gettext tools, version 0.11-pre2</H1>
+<H1>GNU gettext tools, version 0.11</H1>
<H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.11-pre2, 30 November 2001</H2>
+<H2>Edition 0.11, 30 January 2002</H2>
<ADDRESS>Ulrich Drepper</ADDRESS>
<ADDRESS>Jim Meyering</ADDRESS>
<ADDRESS>François Pinard</ADDRESS>
<LI><A NAME="TOC77" HREF="gettext_7.html#SEC77">7.3.4 Output details</A>
<LI><A NAME="TOC78" HREF="gettext_7.html#SEC78">7.3.5 Informative output</A>
</UL>
-<LI><A NAME="TOC79" HREF="gettext_7.html#SEC79">7.4 Invoking the <CODE>msgexec</CODE> Program</A>
+<LI><A NAME="TOC79" HREF="gettext_7.html#SEC79">7.4 Invoking the <CODE>msgfilter</CODE> Program</A>
<UL>
<LI><A NAME="TOC80" HREF="gettext_7.html#SEC80">7.4.1 Input file location</A>
<LI><A NAME="TOC81" HREF="gettext_7.html#SEC81">7.4.2 Output file location</A>
<LI><A NAME="TOC112" HREF="gettext_7.html#SEC112">7.9.3 Output details</A>
<LI><A NAME="TOC113" HREF="gettext_7.html#SEC113">7.9.4 Informative output</A>
</UL>
+<LI><A NAME="TOC114" HREF="gettext_7.html#SEC114">7.10 Invoking the <CODE>msgexec</CODE> Program</A>
+<UL>
+<LI><A NAME="TOC115" HREF="gettext_7.html#SEC115">7.10.1 Input file location</A>
+<LI><A NAME="TOC116" HREF="gettext_7.html#SEC116">7.10.2 Informative output</A>
+</UL>
</UL>
-<LI><A NAME="TOC114" HREF="gettext_8.html#SEC114">8 Producing Binary MO Files</A>
+<LI><A NAME="TOC117" HREF="gettext_8.html#SEC117">8 Producing Binary MO Files</A>
<UL>
-<LI><A NAME="TOC115" HREF="gettext_8.html#SEC115">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>
+<LI><A NAME="TOC118" HREF="gettext_8.html#SEC118">8.1 Invoking the <CODE>msgfmt</CODE> Program</A>
<UL>
-<LI><A NAME="TOC116" HREF="gettext_8.html#SEC116">8.1.1 Input file location</A>
-<LI><A NAME="TOC117" HREF="gettext_8.html#SEC117">8.1.2 Operation mode</A>
-<LI><A NAME="TOC118" HREF="gettext_8.html#SEC118">8.1.3 Output file location</A>
-<LI><A NAME="TOC119" HREF="gettext_8.html#SEC119">8.1.4 Output file location in Java mode</A>
-<LI><A NAME="TOC120" HREF="gettext_8.html#SEC120">8.1.5 Input file interpretation</A>
-<LI><A NAME="TOC121" HREF="gettext_8.html#SEC121">8.1.6 Output details</A>
-<LI><A NAME="TOC122" HREF="gettext_8.html#SEC122">8.1.7 Informative output</A>
+<LI><A NAME="TOC119" HREF="gettext_8.html#SEC119">8.1.1 Input file location</A>
+<LI><A NAME="TOC120" HREF="gettext_8.html#SEC120">8.1.2 Operation mode</A>
+<LI><A NAME="TOC121" HREF="gettext_8.html#SEC121">8.1.3 Output file location</A>
+<LI><A NAME="TOC122" HREF="gettext_8.html#SEC122">8.1.4 Output file location in Java mode</A>
+<LI><A NAME="TOC123" HREF="gettext_8.html#SEC123">8.1.5 Input file interpretation</A>
+<LI><A NAME="TOC124" HREF="gettext_8.html#SEC124">8.1.6 Output details</A>
+<LI><A NAME="TOC125" HREF="gettext_8.html#SEC125">8.1.7 Informative output</A>
</UL>
-<LI><A NAME="TOC123" HREF="gettext_8.html#SEC123">8.2 Invoking the <CODE>msgunfmt</CODE> Program</A>
+<LI><A NAME="TOC126" HREF="gettext_8.html#SEC126">8.2 Invoking the <CODE>msgunfmt</CODE> Program</A>
<UL>
-<LI><A NAME="TOC124" HREF="gettext_8.html#SEC124">8.2.1 Operation mode</A>
-<LI><A NAME="TOC125" HREF="gettext_8.html#SEC125">8.2.2 Input file location</A>
-<LI><A NAME="TOC126" HREF="gettext_8.html#SEC126">8.2.3 Input file location in Java mode</A>
-<LI><A NAME="TOC127" HREF="gettext_8.html#SEC127">8.2.4 Output file location</A>
-<LI><A NAME="TOC128" HREF="gettext_8.html#SEC128">8.2.5 Output details</A>
-<LI><A NAME="TOC129" HREF="gettext_8.html#SEC129">8.2.6 Informative output</A>
+<LI><A NAME="TOC127" HREF="gettext_8.html#SEC127">8.2.1 Operation mode</A>
+<LI><A NAME="TOC128" HREF="gettext_8.html#SEC128">8.2.2 Input file location</A>
+<LI><A NAME="TOC129" HREF="gettext_8.html#SEC129">8.2.3 Input file location in Java mode</A>
+<LI><A NAME="TOC130" HREF="gettext_8.html#SEC130">8.2.4 Output file location</A>
+<LI><A NAME="TOC131" HREF="gettext_8.html#SEC131">8.2.5 Output details</A>
+<LI><A NAME="TOC132" HREF="gettext_8.html#SEC132">8.2.6 Informative output</A>
</UL>
-<LI><A NAME="TOC130" HREF="gettext_8.html#SEC130">8.3 The Format of GNU MO Files</A>
+<LI><A NAME="TOC133" HREF="gettext_8.html#SEC133">8.3 The Format of GNU MO Files</A>
</UL>
-<LI><A NAME="TOC131" HREF="gettext_9.html#SEC131">9 The User's View</A>
+<LI><A NAME="TOC134" HREF="gettext_9.html#SEC134">9 The User's View</A>
<UL>
-<LI><A NAME="TOC132" HREF="gettext_9.html#SEC132">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A>
-<LI><A NAME="TOC133" HREF="gettext_9.html#SEC133">9.2 Magic for Installers</A>
-<LI><A NAME="TOC134" HREF="gettext_9.html#SEC134">9.3 Magic for End Users</A>
+<LI><A NAME="TOC135" HREF="gettext_9.html#SEC135">9.1 The Current <TT>`ABOUT-NLS´</TT> Matrix</A>
+<LI><A NAME="TOC136" HREF="gettext_9.html#SEC136">9.2 Magic for Installers</A>
+<LI><A NAME="TOC137" HREF="gettext_9.html#SEC137">9.3 Magic for End Users</A>
</UL>
-<LI><A NAME="TOC135" HREF="gettext_10.html#SEC135">10 The Programmer's View</A>
+<LI><A NAME="TOC138" HREF="gettext_10.html#SEC138">10 The Programmer's View</A>
<UL>
-<LI><A NAME="TOC136" HREF="gettext_10.html#SEC136">10.1 About <CODE>catgets</CODE></A>
+<LI><A NAME="TOC139" HREF="gettext_10.html#SEC139">10.1 About <CODE>catgets</CODE></A>
<UL>
-<LI><A NAME="TOC137" HREF="gettext_10.html#SEC137">10.1.1 The Interface</A>
-<LI><A NAME="TOC138" HREF="gettext_10.html#SEC138">10.1.2 Problems with the <CODE>catgets</CODE> Interface?!</A>
+<LI><A NAME="TOC140" HREF="gettext_10.html#SEC140">10.1.1 The Interface</A>
+<LI><A NAME="TOC141" HREF="gettext_10.html#SEC141">10.1.2 Problems with the <CODE>catgets</CODE> Interface?!</A>
</UL>
-<LI><A NAME="TOC139" HREF="gettext_10.html#SEC139">10.2 About <CODE>gettext</CODE></A>
+<LI><A NAME="TOC142" HREF="gettext_10.html#SEC142">10.2 About <CODE>gettext</CODE></A>
<UL>
-<LI><A NAME="TOC140" HREF="gettext_10.html#SEC140">10.2.1 The Interface</A>
-<LI><A NAME="TOC141" HREF="gettext_10.html#SEC141">10.2.2 Solving Ambiguities</A>
-<LI><A NAME="TOC142" HREF="gettext_10.html#SEC142">10.2.3 Locating Message Catalog Files</A>
-<LI><A NAME="TOC143" HREF="gettext_10.html#SEC143">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A>
-<LI><A NAME="TOC144" HREF="gettext_10.html#SEC144">10.2.5 Additional functions for plural forms</A>
-<LI><A NAME="TOC145" HREF="gettext_10.html#SEC145">10.2.6 How to use <CODE>gettext</CODE> in GUI programs</A>
-<LI><A NAME="TOC146" HREF="gettext_10.html#SEC146">10.2.7 Optimization of the *gettext functions</A>
+<LI><A NAME="TOC143" HREF="gettext_10.html#SEC143">10.2.1 The Interface</A>
+<LI><A NAME="TOC144" HREF="gettext_10.html#SEC144">10.2.2 Solving Ambiguities</A>
+<LI><A NAME="TOC145" HREF="gettext_10.html#SEC145">10.2.3 Locating Message Catalog Files</A>
+<LI><A NAME="TOC146" HREF="gettext_10.html#SEC146">10.2.4 How to specify the output character set <CODE>gettext</CODE> uses</A>
+<LI><A NAME="TOC147" HREF="gettext_10.html#SEC147">10.2.5 Additional functions for plural forms</A>
+<LI><A NAME="TOC148" HREF="gettext_10.html#SEC148">10.2.6 How to use <CODE>gettext</CODE> in GUI programs</A>
+<LI><A NAME="TOC149" HREF="gettext_10.html#SEC149">10.2.7 Optimization of the *gettext functions</A>
</UL>
-<LI><A NAME="TOC147" HREF="gettext_10.html#SEC147">10.3 Comparing the Two Interfaces</A>
-<LI><A NAME="TOC148" HREF="gettext_10.html#SEC148">10.4 Using libintl.a in own programs</A>
-<LI><A NAME="TOC149" HREF="gettext_10.html#SEC149">10.5 Being a <CODE>gettext</CODE> grok</A>
-<LI><A NAME="TOC150" HREF="gettext_10.html#SEC150">10.6 Temporary Notes for the Programmers Chapter</A>
+<LI><A NAME="TOC150" HREF="gettext_10.html#SEC150">10.3 Comparing the Two Interfaces</A>
+<LI><A NAME="TOC151" HREF="gettext_10.html#SEC151">10.4 Using libintl.a in own programs</A>
+<LI><A NAME="TOC152" HREF="gettext_10.html#SEC152">10.5 Being a <CODE>gettext</CODE> grok</A>
+<LI><A NAME="TOC153" HREF="gettext_10.html#SEC153">10.6 Temporary Notes for the Programmers Chapter</A>
<UL>
-<LI><A NAME="TOC151" HREF="gettext_10.html#SEC151">10.6.1 Temporary - Two Possible Implementations</A>
-<LI><A NAME="TOC152" HREF="gettext_10.html#SEC152">10.6.2 Temporary - About <CODE>catgets</CODE></A>
-<LI><A NAME="TOC153" HREF="gettext_10.html#SEC153">10.6.3 Temporary - Why a single implementation</A>
-<LI><A NAME="TOC154" HREF="gettext_10.html#SEC154">10.6.4 Temporary - Notes</A>
+<LI><A NAME="TOC154" HREF="gettext_10.html#SEC154">10.6.1 Temporary - Two Possible Implementations</A>
+<LI><A NAME="TOC155" HREF="gettext_10.html#SEC155">10.6.2 Temporary - About <CODE>catgets</CODE></A>
+<LI><A NAME="TOC156" HREF="gettext_10.html#SEC156">10.6.3 Temporary - Why a single implementation</A>
+<LI><A NAME="TOC157" HREF="gettext_10.html#SEC157">10.6.4 Temporary - Notes</A>
</UL>
</UL>
-<LI><A NAME="TOC155" HREF="gettext_11.html#SEC155">11 The Translator's View</A>
+<LI><A NAME="TOC158" HREF="gettext_11.html#SEC158">11 The Translator's View</A>
<UL>
-<LI><A NAME="TOC156" HREF="gettext_11.html#SEC156">11.1 Introduction 0</A>
-<LI><A NAME="TOC157" HREF="gettext_11.html#SEC157">11.2 Introduction 1</A>
-<LI><A NAME="TOC158" HREF="gettext_11.html#SEC158">11.3 Discussions</A>
-<LI><A NAME="TOC159" HREF="gettext_11.html#SEC159">11.4 Organization</A>
+<LI><A NAME="TOC159" HREF="gettext_11.html#SEC159">11.1 Introduction 0</A>
+<LI><A NAME="TOC160" HREF="gettext_11.html#SEC160">11.2 Introduction 1</A>
+<LI><A NAME="TOC161" HREF="gettext_11.html#SEC161">11.3 Discussions</A>
+<LI><A NAME="TOC162" HREF="gettext_11.html#SEC162">11.4 Organization</A>
<UL>
-<LI><A NAME="TOC160" HREF="gettext_11.html#SEC160">11.4.1 Central Coordination</A>
-<LI><A NAME="TOC161" HREF="gettext_11.html#SEC161">11.4.2 National Teams</A>
+<LI><A NAME="TOC163" HREF="gettext_11.html#SEC163">11.4.1 Central Coordination</A>
+<LI><A NAME="TOC164" HREF="gettext_11.html#SEC164">11.4.2 National Teams</A>
<UL>
-<LI><A NAME="TOC162" HREF="gettext_11.html#SEC162">11.4.2.1 Sub-Cultures</A>
-<LI><A NAME="TOC163" HREF="gettext_11.html#SEC163">11.4.2.2 Organizational Ideas</A>
+<LI><A NAME="TOC165" HREF="gettext_11.html#SEC165">11.4.2.1 Sub-Cultures</A>
+<LI><A NAME="TOC166" HREF="gettext_11.html#SEC166">11.4.2.2 Organizational Ideas</A>
</UL>
-<LI><A NAME="TOC164" HREF="gettext_11.html#SEC164">11.4.3 Mailing Lists</A>
+<LI><A NAME="TOC167" HREF="gettext_11.html#SEC167">11.4.3 Mailing Lists</A>
</UL>
-<LI><A NAME="TOC165" HREF="gettext_11.html#SEC165">11.5 Information Flow</A>
+<LI><A NAME="TOC168" HREF="gettext_11.html#SEC168">11.5 Information Flow</A>
</UL>
-<LI><A NAME="TOC166" HREF="gettext_12.html#SEC166">12 The Maintainer's View</A>
+<LI><A NAME="TOC169" HREF="gettext_12.html#SEC169">12 The Maintainer's View</A>
<UL>
-<LI><A NAME="TOC167" HREF="gettext_12.html#SEC167">12.1 Flat or Non-Flat Directory Structures</A>
-<LI><A NAME="TOC168" HREF="gettext_12.html#SEC168">12.2 Prerequisite Works</A>
-<LI><A NAME="TOC169" HREF="gettext_12.html#SEC169">12.3 Invoking the <CODE>gettextize</CODE> Program</A>
-<LI><A NAME="TOC170" HREF="gettext_12.html#SEC170">12.4 Files You Must Create or Alter</A>
+<LI><A NAME="TOC170" HREF="gettext_12.html#SEC170">12.1 Flat or Non-Flat Directory Structures</A>
+<LI><A NAME="TOC171" HREF="gettext_12.html#SEC171">12.2 Prerequisite Works</A>
+<LI><A NAME="TOC172" HREF="gettext_12.html#SEC172">12.3 Invoking the <CODE>gettextize</CODE> Program</A>
+<LI><A NAME="TOC173" HREF="gettext_12.html#SEC173">12.4 Files You Must Create or Alter</A>
+<UL>
+<LI><A NAME="TOC174" HREF="gettext_12.html#SEC174">12.4.1 <TT>`POTFILES.in´</TT> in <TT>`po/´</TT></A>
+<LI><A NAME="TOC175" HREF="gettext_12.html#SEC175">12.4.2 <TT>`LINGUAS´</TT> in <TT>`po/´</TT></A>
+<LI><A NAME="TOC176" HREF="gettext_12.html#SEC176">12.4.3 <TT>`Makefile´</TT> pieces in <TT>`po/´</TT></A>
+<LI><A NAME="TOC177" HREF="gettext_12.html#SEC177">12.4.4 <TT>`configure.in´</TT> at top level</A>
+<LI><A NAME="TOC178" HREF="gettext_12.html#SEC178">12.4.5 <TT>`config.guess´</TT>, <TT>`config.sub´</TT> at top level</A>
+<LI><A NAME="TOC179" HREF="gettext_12.html#SEC179">12.4.6 <TT>`aclocal.m4´</TT> at top level</A>
+<LI><A NAME="TOC180" HREF="gettext_12.html#SEC180">12.4.7 <TT>`acconfig.h´</TT> at top level</A>
+<LI><A NAME="TOC181" HREF="gettext_12.html#SEC181">12.4.8 <TT>`Makefile.in´</TT> at top level</A>
+<LI><A NAME="TOC182" HREF="gettext_12.html#SEC182">12.4.9 <TT>`Makefile.in´</TT> in <TT>`src/´</TT></A>
+<LI><A NAME="TOC183" HREF="gettext_12.html#SEC183">12.4.10 <TT>`gettext.h´</TT> in <TT>`lib/´</TT></A>
+</UL>
+<LI><A NAME="TOC184" HREF="gettext_12.html#SEC184">12.5 Autoconf macros for use in <TT>`configure.in´</TT></A>
<UL>
-<LI><A NAME="TOC171" HREF="gettext_12.html#SEC171">12.4.1 <TT>`POTFILES.in´</TT> in <TT>`po/´</TT></A>
-<LI><A NAME="TOC172" HREF="gettext_12.html#SEC172">12.4.2 <TT>`LINGUAS´</TT> in <TT>`po/´</TT></A>
-<LI><A NAME="TOC173" HREF="gettext_12.html#SEC173">12.4.3 <TT>`Makefile´</TT> pieces in <TT>`po/´</TT></A>
-<LI><A NAME="TOC174" HREF="gettext_12.html#SEC174">12.4.4 <TT>`configure.in´</TT> at top level</A>
-<LI><A NAME="TOC175" HREF="gettext_12.html#SEC175">12.4.5 <TT>`config.guess´</TT>, <TT>`config.sub´</TT> at top level</A>
-<LI><A NAME="TOC176" HREF="gettext_12.html#SEC176">12.4.6 <TT>`aclocal.m4´</TT> at top level</A>
-<LI><A NAME="TOC177" HREF="gettext_12.html#SEC177">12.4.7 <TT>`acconfig.h´</TT> at top level</A>
-<LI><A NAME="TOC178" HREF="gettext_12.html#SEC178">12.4.8 <TT>`Makefile.in´</TT> at top level</A>
-<LI><A NAME="TOC179" HREF="gettext_12.html#SEC179">12.4.9 <TT>`Makefile.in´</TT> in <TT>`src/´</TT></A>
+<LI><A NAME="TOC185" HREF="gettext_12.html#SEC185">12.5.1 AM_GNU_GETTEXT in <TT>`gettext.m4´</TT></A>
+<LI><A NAME="TOC186" HREF="gettext_12.html#SEC186">12.5.2 AM_ICONV in <TT>`iconv.m4´</TT></A>
</UL>
</UL>
-<LI><A NAME="TOC180" HREF="gettext_13.html#SEC180">13 Other Programming Languages</A>
+<LI><A NAME="TOC187" HREF="gettext_13.html#SEC187">13 Other Programming Languages</A>
<UL>
-<LI><A NAME="TOC181" HREF="gettext_13.html#SEC181">13.1 The Language Implementor's View</A>
-<LI><A NAME="TOC182" HREF="gettext_13.html#SEC182">13.2 The Programmer's View</A>
-<LI><A NAME="TOC183" HREF="gettext_13.html#SEC183">13.3 The Translator's View</A>
-<LI><A NAME="TOC184" HREF="gettext_13.html#SEC184">13.4 Individual Programming Languages</A>
+<LI><A NAME="TOC188" HREF="gettext_13.html#SEC188">13.1 The Language Implementor's View</A>
+<LI><A NAME="TOC189" HREF="gettext_13.html#SEC189">13.2 The Programmer's View</A>
+<LI><A NAME="TOC190" HREF="gettext_13.html#SEC190">13.3 The Translator's View</A>
+<LI><A NAME="TOC191" HREF="gettext_13.html#SEC191">13.4 The Maintainer's View</A>
+<LI><A NAME="TOC192" HREF="gettext_13.html#SEC192">13.5 Individual Programming Languages</A>
<UL>
-<LI><A NAME="TOC185" HREF="gettext_13.html#SEC185">13.4.1 C, C++, Objective C</A>
-<LI><A NAME="TOC186" HREF="gettext_13.html#SEC186">13.4.2 sh - Shell Script</A>
-<LI><A NAME="TOC187" HREF="gettext_13.html#SEC187">13.4.3 bash - Bourne-Again Shell Script</A>
-<LI><A NAME="TOC188" HREF="gettext_13.html#SEC188">13.4.4 Python</A>
-<LI><A NAME="TOC189" HREF="gettext_13.html#SEC189">13.4.5 GNU clisp - Common Lisp</A>
-<LI><A NAME="TOC190" HREF="gettext_13.html#SEC190">13.4.6 GNU clisp C sources</A>
-<LI><A NAME="TOC191" HREF="gettext_13.html#SEC191">13.4.7 Emacs Lisp</A>
-<LI><A NAME="TOC192" HREF="gettext_13.html#SEC192">13.4.8 librep</A>
-<LI><A NAME="TOC193" HREF="gettext_13.html#SEC193">13.4.9 GNU Smalltalk</A>
-<LI><A NAME="TOC194" HREF="gettext_13.html#SEC194">13.4.10 Java</A>
-<LI><A NAME="TOC195" HREF="gettext_13.html#SEC195">13.4.11 GNU awk</A>
-<LI><A NAME="TOC196" HREF="gettext_13.html#SEC196">13.4.12 Pascal - Free Pascal Compiler</A>
-<LI><A NAME="TOC197" HREF="gettext_13.html#SEC197">13.4.13 wxWindows library</A>
-<LI><A NAME="TOC198" HREF="gettext_13.html#SEC198">13.4.14 YCP - YaST2 scripting language</A>
-<LI><A NAME="TOC199" HREF="gettext_13.html#SEC199">13.4.15 Perl</A>
-<LI><A NAME="TOC200" HREF="gettext_13.html#SEC200">13.4.16 PHP Hypertext Preprocessor</A>
-<LI><A NAME="TOC201" HREF="gettext_13.html#SEC201">13.4.17 Pike</A>
+<LI><A NAME="TOC193" HREF="gettext_13.html#SEC193">13.5.1 C, C++, Objective C</A>
+<LI><A NAME="TOC194" HREF="gettext_13.html#SEC194">13.5.2 sh - Shell Script</A>
+<LI><A NAME="TOC195" HREF="gettext_13.html#SEC195">13.5.3 bash - Bourne-Again Shell Script</A>
+<LI><A NAME="TOC196" HREF="gettext_13.html#SEC196">13.5.4 Python</A>
+<LI><A NAME="TOC197" HREF="gettext_13.html#SEC197">13.5.5 GNU clisp - Common Lisp</A>
+<LI><A NAME="TOC198" HREF="gettext_13.html#SEC198">13.5.6 GNU clisp C sources</A>
+<LI><A NAME="TOC199" HREF="gettext_13.html#SEC199">13.5.7 Emacs Lisp</A>
+<LI><A NAME="TOC200" HREF="gettext_13.html#SEC200">13.5.8 librep</A>
+<LI><A NAME="TOC201" HREF="gettext_13.html#SEC201">13.5.9 GNU Smalltalk</A>
+<LI><A NAME="TOC202" HREF="gettext_13.html#SEC202">13.5.10 Java</A>
+<LI><A NAME="TOC203" HREF="gettext_13.html#SEC203">13.5.11 GNU awk</A>
+<LI><A NAME="TOC204" HREF="gettext_13.html#SEC204">13.5.12 Pascal - Free Pascal Compiler</A>
+<LI><A NAME="TOC205" HREF="gettext_13.html#SEC205">13.5.13 wxWindows library</A>
+<LI><A NAME="TOC206" HREF="gettext_13.html#SEC206">13.5.14 YCP - YaST2 scripting language</A>
+<LI><A NAME="TOC207" HREF="gettext_13.html#SEC207">13.5.15 Perl</A>
+<LI><A NAME="TOC208" HREF="gettext_13.html#SEC208">13.5.16 PHP Hypertext Preprocessor</A>
+<LI><A NAME="TOC209" HREF="gettext_13.html#SEC209">13.5.17 Pike</A>
</UL>
-<LI><A NAME="TOC202" HREF="gettext_13.html#SEC202">13.5 Internationalizable Data</A>
+<LI><A NAME="TOC210" HREF="gettext_13.html#SEC210">13.6 Internationalizable Data</A>
<UL>
-<LI><A NAME="TOC203" HREF="gettext_13.html#SEC203">13.5.1 POT - Portable Object Template</A>
-<LI><A NAME="TOC204" HREF="gettext_13.html#SEC204">13.5.2 Resource String Table</A>
+<LI><A NAME="TOC211" HREF="gettext_13.html#SEC211">13.6.1 POT - Portable Object Template</A>
+<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13.6.2 Resource String Table</A>
</UL>
</UL>
-<LI><A NAME="TOC205" HREF="gettext_14.html#SEC205">14 Concluding Remarks</A>
+<LI><A NAME="TOC213" HREF="gettext_14.html#SEC213">14 Concluding Remarks</A>
<UL>
-<LI><A NAME="TOC206" HREF="gettext_14.html#SEC206">14.1 History of GNU <CODE>gettext</CODE></A>
-<LI><A NAME="TOC207" HREF="gettext_14.html#SEC207">14.2 Related Readings</A>
+<LI><A NAME="TOC214" HREF="gettext_14.html#SEC214">14.1 History of GNU <CODE>gettext</CODE></A>
+<LI><A NAME="TOC215" HREF="gettext_14.html#SEC215">14.2 Related Readings</A>
</UL>
-<LI><A NAME="TOC208" HREF="gettext_15.html#SEC208">A Language Codes</A>
-<LI><A NAME="TOC209" HREF="gettext_16.html#SEC209">B Country Codes</A>
+<LI><A NAME="TOC216" HREF="gettext_15.html#SEC216">A Language Codes</A>
+<LI><A NAME="TOC217" HREF="gettext_16.html#SEC217">B Country Codes</A>
</UL>
<P><HR><P>
-This document was generated on 30 November 2001 using the
+This document was generated on 31 January 2002 using the
<A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
translator version 1.52a.</P>
</BODY>
-@set UPDATED 30 November 2001
-@set UPDATED-MONTH November 2001
-@set EDITION 0.11-pre2
-@set VERSION 0.11-pre2
+@set UPDATED 30 January 2002
+@set UPDATED-MONTH January 2002
+@set EDITION 0.11
+@set VERSION 0.11
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
JAR = @JAR@
#define YYPURE 1
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
#endif
#endif
\f
-#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
# Sources that are compiled on all platforms.
-libgettextlib_la_SOURCES = addext.c argmatch.c backupfile.c basename.c \
-c-ctype.c concatpath.c copy-file.c execute.c findprog.c fstrcmp.c \
-full-write.c gcd.c getopt.c getopt1.c hash.c javacomp.c javaexec.c \
-linebreak.c localcharset.c mbswidth.c obstack.c pipe-bidi.c pipe-in.c \
-pipe-out.c progname.c safe-read.c sh-quote.c tmpdir.c wait-process.c xerror.c \
-xgetcwd.c xmalloc.c xstrdup.c
-
-
-libgettextlib_la_HEADER = argmatch.h backupfile.h basename.h c-ctype.h \
-copy-file.h execute.h findprog.h fstrcmp.h full-write.h gcd.h getopt.h hash.h \
-javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h obstack.h pathmax.h \
-pipe.h progname.h safe-read.h sh-quote.h system.h tmpdir.h utf8-ucs4.h \
-utf16-ucs4.h wait-process.h xerror.h xmalloc.h
+libgettextlib_la_SOURCES = \
+ argmatch.h argmatch.c \
+ backupfile.h backupfile.c addext.c \
+ basename.h basename.c \
+ binary-io.h \
+ c-ctype.h c-ctype.c \
+ copy-file.h copy-file.c \
+ error.h error.c \
+ execute.h execute.c \
+ exit.h \
+ findprog.h findprog.c \
+ fstrcmp.h fstrcmp.c \
+ full-write.h full-write.c \
+ gcd.h gcd.c \
+ getopt.h getopt.c getopt1.c \
+ hash.h hash.c \
+ javacomp.h javacomp.c \
+ javaexec.h javaexec.c \
+ linebreak.h linebreak.c lbrkprop.h utf8-ucs4.h utf16-ucs4.h \
+ localcharset.c \
+ mbswidth.h mbswidth.c \
+ minmax.h \
+ obstack.h obstack.c \
+ pathmax.h \
+ pathname.h concatpath.c \
+ pipe.h pipe-bidi.c pipe-in.c pipe-out.c \
+ progname.h progname.c \
+ safe-read.h safe-read.c \
+ sh-quote.h sh-quote.c \
+ strtoul.c \
+ tmpdir.h tmpdir.c \
+ wait-process.h wait-process.c \
+ xerror.h xerror.c \
+ xmalloc.h xmalloc.c xstrdup.c \
+ xsetenv.h xsetenv.c
# Sources that are compiled only on platforms that lack the functions.
-LIBADD_SOURCE = alloca.c error.c getline.c memset.c mkdtemp.c setenv.c \
-stpcpy.c stpncpy.c strcasecmp.c strcspn.c strncasecmp.c strpbrk.c strstr.c \
-strtol.c strtoul.c vasprintf.c
+LIBADD_SOURCE = \
+ liballoca.h alloca.c \
+ getline.h getline.c \
+ memset.c \
+ mkdtemp.h mkdtemp.c \
+ pfnmatch.h pfnmatch.c \
+ setenv.h setenv.c \
+ stpcpy.h stpcpy.c \
+ stpncpy.h stpncpy.c \
+ strcase.h strcasecmp.c strncasecmp.c \
+ strcspn.c \
+ strpbrk.h strpbrk.c \
+ strstr.h strstr.c \
+ strtol.c \
+ vasprintf.c
-LIBADD_HEADER = error.h getline.h mkdtemp.h setenv.h strpbrk.h strstr.h
-
# Unused sources.
-UNUSED_SOURCE = memmove.c
+UNUSED_SOURCE = \
+ memmove.c \
+ xgetcwd.h xgetcwd.c
-UNUSED_HEADER =
# How to build libgettextlib.la.
libgettextlib_la_LIBADD = @LTALLOCA@ @LTLIBOBJS@
-# Need @INTLLIBS@ because many source files use gettext().
-# Need @LIBICONV@ because linebreak.c uses iconv().
+# Need @LTLIBINTL@ because many source files use gettext().
+# Need @LTLIBICONV@ because linebreak.c uses iconv().
libgettextlib_la_LDFLAGS = \
-release @VERSION@ \
- @INTLLIBS@ @LIBICONV@ -no-undefined
+ @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
+
+# Extra files to be installed.
+gettextsrcdir = $(datadir)/gettext
+gettextsrc_DATA = gettext.h
+
# List of files to be distributed.
-noinst_HEADERS = $(libgettextlib_la_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER)
+noinst_HEADERS = gettext.h
EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \
$(LIBADD_SOURCE) $(UNUSED_SOURCE) \
DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
+
+DISTCLEANFILES = fnmatch.h
MOSTLYCLEANFILES = @STDBOOL_H@
charset_alias = $(DESTDIR)$(libdir)/charset.alias
LTLIBRARIES = $(lib_LTLIBRARIES)
libgettextlib_la_DEPENDENCIES = @LTALLOCA@ @LTLIBOBJS@
-am_libgettextlib_la_OBJECTS = addext.lo argmatch.lo backupfile.lo \
- basename.lo c-ctype.lo concatpath.lo copy-file.lo execute.lo \
+am_libgettextlib_la_OBJECTS = argmatch.lo backupfile.lo addext.lo \
+ basename.lo c-ctype.lo copy-file.lo error.lo execute.lo \
findprog.lo fstrcmp.lo full-write.lo gcd.lo getopt.lo \
getopt1.lo hash.lo javacomp.lo javaexec.lo linebreak.lo \
- localcharset.lo mbswidth.lo obstack.lo pipe-bidi.lo pipe-in.lo \
- pipe-out.lo progname.lo safe-read.lo sh-quote.lo tmpdir.lo \
- wait-process.lo xerror.lo xgetcwd.lo xmalloc.lo xstrdup.lo
+ localcharset.lo mbswidth.lo obstack.lo concatpath.lo \
+ pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo safe-read.lo \
+ sh-quote.lo strtoul.lo tmpdir.lo wait-process.lo xerror.lo \
+ xmalloc.lo xstrdup.lo xsetenv.lo
libgettextlib_la_OBJECTS = $(am_libgettextlib_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(libgettextlib_la_SOURCES)
+DATA = $(gettextsrc_DATA)
+
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
- alloca.c error.c error.h getline.c javacomp.sh.in \
- javaexec.sh.in memset.c mkdtemp.c setenv.c stpcpy.c stpncpy.c \
- strcasecmp.c strcspn.c strncasecmp.c strpbrk.c strstr.c \
- strtoul.c vasprintf.c
+ alloca.c getline.c javacomp.sh.in javaexec.sh.in memset.c \
+ mkdtemp.c pfnmatch.c setenv.c stpcpy.c stpncpy.c strcasecmp.c \
+ strcspn.c strncasecmp.c strpbrk.c strstr.c vasprintf.c
SOURCES = $(libgettextlib_la_SOURCES)
all: all-am
.c.lo:
$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
uninstall-info-am:
+install-gettextsrcDATA: $(gettextsrc_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir)
+ @list='$(gettextsrc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f"; \
+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gettextsrcdir)/$$f; \
+ done
+
+uninstall-gettextsrcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(gettextsrc_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(gettextsrcdir)/$$f"; \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$f; \
+ done
tags: TAGS
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gettextsrcdir)
install: install-am
install-exec: install-exec-am
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
info-am:
-install-data-am:
+install-data-am: install-gettextsrcDATA
install-exec-am: install-exec-local install-libLTLIBRARIES
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
+uninstall-am: uninstall-gettextsrcDATA uninstall-info-am \
+ uninstall-libLTLIBRARIES uninstall-local
.PHONY: GTAGS all all-am all-local check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-exec-local \
- install-info install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- tags uninstall uninstall-am uninstall-info-am \
+ install-gettextsrcDATA install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool tags uninstall \
+ uninstall-am uninstall-gettextsrcDATA uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-local
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
aclocaldir = @aclocaldir@
-aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4
+aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4
# 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 \
-backupfile.m4 c-bs-a.m4 codeset.m4 flex.m4 getline.m4 gettext.m4 \
-glibc21.m4 hostname.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 javacomp.m4 \
-javaexec.m4 lcmessage.m4 libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 \
-mkdtemp.m4 progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 \
-signed.m4 ssize_t.m4 stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 \
-ulonglong.m4 unionwait.m4
+backupfile.m4 c-bs-a.m4 codeset.m4 error.m4 flex.m4 fnmatch.m4 getline.m4 \
+gettext.m4 glibc21.m4 hostname.m4 iconv.m4 inttypes_h.m4 isc-posix.m4 \
+javacomp.m4 javaexec.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 \
+libtool.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 mkdtemp.m4 progtest.m4 \
+setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 signed.m4 ssize_t.m4 \
+stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 ulonglong.m4 unionwait.m4
subdir = m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
mandir = @mandir@
PERL = @PERL@
# A manual page for each of the bin_PROGRAMS in src/Makefile.am.
man_aux = gettext.x ngettext.x \
msgcmp.x msgfmt.x msgmerge.x msgunfmt.x xgettext.x \
-msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msggrep.x msginit.x msguniq.x
+msgattrib.x msgcat.x msgcomm.x msgconv.x msgen.x msgexec.x msgfilter.x msggrep.x msginit.x msguniq.x
man_MAN1IN = gettext.1.in ngettext.1.in
man_MAN1OTHER = \
msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
-msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msggrep.1 msginit.1 msguniq.1
+msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1
man_MAN1 = $(man_MAN1GEN) $(man_MAN1OTHER)
man_MAN3 = gettext.3 ngettext.3 \
man_HTMLIN = gettext.1.html.in ngettext.1.html.in
man_HTMLOTHER = \
msgcmp.1.html msgfmt.1.html msgmerge.1.html msgunfmt.1.html xgettext.1.html \
-msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msggrep.1.html msginit.1.html msguniq.1.html \
+msgattrib.1.html msgcat.1.html msgcomm.1.html msgconv.1.html msgen.1.html msgexec.1.html msgfilter.1.html msggrep.1.html msginit.1.html msguniq.1.html \
gettext.3.html ngettext.3.html \
textdomain.3.html bindtextdomain.3.html bind_textdomain_codeset.3.html
$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgen$(EXEEXT) $(srcdir)/msgen.x msgen.1
msgexec.1: msgexec.x
$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgexec$(EXEEXT) $(srcdir)/msgexec.x msgexec.1
+msgfilter.1: msgfilter.x
+ $(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msgfilter$(EXEEXT) $(srcdir)/msgfilter.x msgfilter.1
msggrep.1: msggrep.x
$(SHELL) x-to-1 "$(PERL)" "$(HELP2MAN)" ../src/msggrep$(EXEEXT) $(srcdir)/msggrep.x msggrep.1
msginit.1: msginit.x
msgexec.1.html: msgexec.1
$(MAN2HTML) `if test -f msgexec.1; then echo .; else echo $(srcdir); fi`/msgexec.1 | sed -e '/CreationDate:/d' > t-$@
mv t-$@ $@
+msgfilter.1.html: msgfilter.1
+ $(MAN2HTML) `if test -f msgfilter.1; then echo .; else echo $(srcdir); fi`/msgfilter.1 | sed -e '/CreationDate:/d' > t-$@
+ mv t-$@ $@
msggrep.1.html: msggrep.1
$(MAN2HTML) `if test -f msggrep.1; then echo .; else echo $(srcdir); fi`/msggrep.1 | sed -e '/CreationDate:/d' > t-$@
mv t-$@ $@
.\" GNU gettext source code and manual
.\" LI18NUX 2000 Globalization Specification
.\"
-.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11-pre2"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.11"
.SH NAME
bind_textdomain_codeset \- set encoding of message translations
.SH SYNOPSIS
.\" GNU gettext source code and manual
.\" LI18NUX 2000 Globalization Specification
.\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11-pre2"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.11"
.SH NAME
bindtextdomain \- set directory containing message catalogs
.SH SYNOPSIS
.\" GNU gettext source code and manual
.\" LI18NUX 2000 Globalization Specification
.\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.11-pre2"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.11"
.SH NAME
gettext, dgettext, dcgettext \- translate message
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGATTRIB "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgattrib \- attribute matching and manipulation on message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCAT "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGCAT "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgcat \- combines several message catalogs
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCMP "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGCMP "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgcmp \- compare message catalog and template
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCOMM "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGCOMM "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgcomm \- match two message catalogs
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGCONV "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGCONV "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgconv \- character set conversion for message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGEN "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGEN "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgen \- create English message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGEXEC "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGEXEC "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
-msgexec \- edit translations of message catalog
+msgexec \- process translations of message catalog
.SH SYNOPSIS
.B msgexec
-[\fIOPTION\fR] \fIFILTER \fR[\fIFILTER-OPTION\fR]
+[\fIOPTION\fR] \fICOMMAND \fR[\fICOMMAND-OPTION\fR]
.SH DESCRIPTION
.\" Add any additional description here
.PP
-Applies a filter to all translations of a translation catalog.
+Applies a command to all translations of a translation catalog.
+The COMMAND can be any program that reads a translation from standard
+input. It is invoked once for each translation. Its output becomes
+msgexec's output. msgexec's return code is the maximum return code
+across all invocations.
+.PP
+A special builtin command called '0' outputs the translation, followed by a
+null byte. The output of "msgexec 0" is suitable as input for "xargs \fB\-0\fR".
.PP
Mandatory arguments to long options are mandatory for short options too.
.SS "Input file location:"
add DIRECTORY to list for input files search
.PP
If no input file is given or if it is -, standard input is read.
-.SS "Output file location:"
-.TP
-\fB\-o\fR, \fB\-\-output\-file\fR=\fIFILE\fR
-write output to specified file
-.PP
-The results are written to standard output if no output file is specified
-or if it is -.
-.PP
-The FILTER can be any program that reads a translation from standard input
-and writes a modified translation to standard output.
-.SS "Useful FILTER-OPTIONs when the FILTER is 'sed':"
-.TP
-\fB\-e\fR, \fB\-\-expression\fR=\fISCRIPT\fR
-add SCRIPT to the commands to be executed
-.TP
-\fB\-f\fR, \fB\-\-file\fR=\fISCRIPTFILE\fR
-add the contents of SCRIPTFILE to the commands
-to be executed
-.TP
-\fB\-n\fR, \fB\-\-quiet\fR, \fB\-\-silent\fR
-suppress automatic printing of pattern space
-.SS "Output details:"
-.TP
-\fB\-\-no\-escape\fR
-do not use C escapes in output (default)
-.TP
-\fB\-E\fR, \fB\-\-escape\fR
-use C escapes in output, no extended chars
-.TP
-\fB\-\-force\-po\fR
-write PO file even if empty
-.TP
-\fB\-\-indent\fR
-indented output style
-.TP
-\fB\-\-no\-location\fR
-suppress '#: filename:line' lines
-.TP
-\fB\-\-add\-location\fR
-preserve '#: filename:line' lines (default)
-.TP
-\fB\-\-strict\fR
-strict Uniforum output style
-.TP
-\fB\-w\fR, \fB\-\-width\fR=\fINUMBER\fR
-set output page width
-.TP
-\fB\-s\fR, \fB\-\-sort\-output\fR
-generate sorted output
-.TP
-\fB\-F\fR, \fB\-\-sort\-by\-file\fR
-sort output by file location
.SS "Informative output:"
.TP
\fB\-h\fR, \fB\-\-help\fR
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-msgexec - edit translations of message catalog</td></table>
+msgexec - process translations of message catalog</td></table>
<a name="SYNOPSIS"></a>
<h2>SYNOPSIS</h2>
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-<b>msgexec</b> [<i>OPTION</i>] <i>FILTER</i>
-[<i>FILTER-OPTION</i>]</td></table>
+<b>msgexec</b> [<i>OPTION</i>] <i>COMMAND</i>
+[<i>COMMAND-OPTION</i>]</td></table>
<a name="DESCRIPTION"></a>
<h2>DESCRIPTION</h2>
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Applies a filter to all translations of a translation
-catalog.</td></table>
+Applies a command to all translations of a translation
+catalog. The COMMAND can be any program that reads a
+translation from standard input. It is invoked once for each
+translation. Its output becomes msgexec's output. msgexec's
+return code is the maximum return code across all
+invocations.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+ cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+A special builtin command called '0' outputs the
+translation, followed by a null byte. The output of
+"msgexec 0" is suitable as input for "xargs
+<b>-0</b>".</td></table>
<table width="100%" border=0 rules="none" frame="void"
cols="2" cellspacing="0" cellpadding="0">
If no input file is given or if it is -, standard input is
read.</td></table>
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="4%"></td><td width="96%">
-<b>Output file location:</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-o</b>, <b>--output-file</b>=<i>FILE</i></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-write output to specified file</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-The results are written to standard output if no output file
-is specified or if it is -.</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-The FILTER can be any program that reads a translation from
-standard input and writes a modified translation to standard
-output.</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="4%"></td><td width="96%">
-<b>Useful FILTER-OPTIONs when the FILTER is
-'sed':</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-e</b>, <b>--expression</b>=<i>SCRIPT</i></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-add SCRIPT to the commands to be executed</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-f</b>, <b>--file</b>=<i>SCRIPTFILE</i></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-add the contents of SCRIPTFILE to the commands to be
-executed</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-n</b>, <b>--quiet</b>, <b>--silent</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-suppress automatic printing of pattern space</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="4%"></td><td width="96%">
-<b>Output details:</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--no-escape</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-do not use C escapes in output (default)</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-E</b>, <b>--escape</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-use C escapes in output, no extended chars</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--force-po</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-write PO file even if empty</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--indent</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-indented output style</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--no-location</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-suppress '#: filename:line' lines</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--add-location</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-preserve '#: filename:line' lines (default)</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>--strict</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-strict Uniforum output style</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-w</b>, <b>--width</b>=<i>NUMBER</i></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-set output page width</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-s</b>, <b>--sort-output</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-generate sorted output</td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="10%"></td><td width="90%">
-<b>-F</b>, <b>--sort-by-file</b></td></table>
-
-<table width="100%" border=0 rules="none" frame="void"
- cols="2" cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="21%"></td><td width="79%">
-sort output by file location</td></table>
-
<table width="100%" border=0 rules="none" frame="void"
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGFMT "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGFMT "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgfmt \- compile message catalog to binary format
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGGREP "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGGREP "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msggrep \- pattern matching on message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGINIT "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGINIT "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msginit \- initialize a message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGMERGE "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGMERGE "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgmerge \- merge message catalog and template
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGUNFMT "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msgunfmt \- uncompile message catalog from binary format
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH MSGUNIQ "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
msguniq \- unify duplicate translations in message catalog
.SH SYNOPSIS
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2001 Free Software Foundation, Inc.
+Copyright \(co 2001-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 2001 Free Software Foundation, Inc.<br>
+Copyright 2001-2002 Free Software Foundation, Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
MERCHANTABILITY or FITNESS FOR A PARTICULAR
.\" GNU gettext source code and manual
.\" LI18NUX 2000 Globalization Specification
.\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11-pre2"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.11"
.SH NAME
ngettext, dngettext, dcngettext \- translate message and choose plural form
.SH SYNOPSIS
.\" GNU gettext source code and manual
.\" LI18NUX 2000 Globalization Specification
.\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11-pre2"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.11"
.SH NAME
textdomain \- set domain for future gettext() calls
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24.
-.TH XGETTEXT "1" "November 2001" "GNU gettext 0.11-pre1" GNU
+.TH XGETTEXT "1" "January 2002" "GNU gettext 0.11" GNU
.SH NAME
xgettext \- extract gettext strings from source
.SH SYNOPSIS
.TP
\fB\-L\fR, \fB\-\-language\fR=\fINAME\fR
recognise the specified language
-(C, C++, ObjectiveC, PO, Java, YCP)
+(C, C++, ObjectiveC, PO, Lisp, EmacsLisp,
+librep, Java, YCP)
.TP
\fB\-C\fR, \fB\-\-c\fR++
shorthand for \fB\-\-language\fR=\fIC\fR++
\fB\-\-omit\-header\fR
don't write header with `msgid ""' entry
.TP
+\fB\-\-copyright\-holder\fR=\fISTRING\fR
+set copyright holder in output
+.TP
\fB\-\-foreign\-user\fR
omit FSF copyright in output for foreign user
.TP
.SH "REPORTING BUGS"
Report bugs to <bug-gnu-gettext@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2002 Free Software Foundation, Inc.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
<tr valign="top" align="left">
<td width="21%"></td><td width="79%">
recognise the specified language (C, C++, ObjectiveC, PO,
-Java, YCP)</td></table>
+Lisp, EmacsLisp, librep, Java, YCP)</td></table>
<table width="100%" border=0 rules="none" frame="void"
cols="2" cellspacing="0" cellpadding="0">
don't write header with `msgid ""'
entry</td></table>
+<table width="100%" border=0 rules="none" frame="void"
+ cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--copyright-holder</b>=<i>STRING</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+ cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+set copyright holder in output</td></table>
+
<table width="100%" border=0 rules="none" frame="void"
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
cols="2" cellspacing="0" cellpadding="0">
<tr valign="top" align="left">
<td width="10%"></td><td width="90%">
-Copyright 1995-1998, 2000, 2001 Free Software Foundation,
+Copyright 1995-1998, 2000-2002 Free Software Foundation,
Inc.<br>
This is free software; see the source for copying
conditions. There is NO warranty; not even for
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
AUTOMAKE_OPTIONS = 1.2 gnits
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-16 13:53+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-17 20:18+01:00\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
msgid "error after reading \"%s\""
msgstr "error després d'haver llegit «%s»"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Error desconegut del sistema"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "el nombre d'especificacions de format en «msgid» i «%s» no coincideix"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
"les especificacions de format en «msgid» i «%s» de l'argument %u no són les "
"mateixes"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"no existeix una especificació de format, com en «%2$s», de l'argument %1$u "
+"en «msgid»"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "no existeix una especificació de format de l'argument %u en «%s»"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"no existeix una especificació de format, com en «%2$s», de l'argument {%1$u} "
"en «msgid»"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "no existeix una especificació de format de l'argument {%u} en «%s»"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"les especificacions de format en «msgid» i «%s» de l'argument «%s» no són "
"les mateixes"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "no existeix una especificació de format de l'argument %u en «%s»"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"no existeix una especificació de format, com en «%2$s», de l'argument %1$u "
-"en «msgid»"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address adreces corresponents al nom d'estació\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "no s'ha pogut obtenir el nom d'estació"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "es permet com a molt un fitxer d'entrada"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "«%s» i «%s» són mútuament excloents"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Forma d'ús: %s [OPCIÓ] [FITXERENTRADA]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
"Els arguments obligatoris per les opcions llargues també ho són\n"
"per les opcions curtes corresponents.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"l'entrada estàndard.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[0] "s'ha trobat %d error fatal"
msgstr[1] "s'han trobat %d errors fatals"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "la definició del missatge és duplicada"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...aquesta és la ubicació de la primera definició"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "sobren marques d'accelerador de teclat «%c» en «msgstr»"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "manca el camp de capçalera «%s» en la capçalera"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "cal que el camp de capçalera «%s» comence en l'inici de la línia"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
"alguns camps de la capçalera encara tenen els valors inicials per defecte"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "el camp «%s» encara té el valor inicial per defecte"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "avís: la conversió del joc de caràcters no funcionarà\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "avís: la capçalera del fitxer PO està marcada amb «fuzzy»\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"el nom de domini «%s» no és adequat com a nom de fitxer: se n'usarà un prefix"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "es descarta la directiva «domain %s»"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "es descarta l'entrada «msgstr» buida"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "es descarta l'entrada «msgstr» difusa"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: avís: el fitxer font conté una traducció difusa"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "no es pot usar l'opció «%c» abans d'especificar «K» o «T»"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extrau d'un catàleg de traduccions tots els missatges que concorden amb\n"
"un patró especificat o que pertanyen a uns fitxers font indicats.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FITXER obté el PATRÓ del FITXER\n"
" -i, --ignore-case no diferencia entre majúscules i minúscules\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output genera una eixida ordenada\n"
" --sort-by-file ordena l'eixida pels noms de fitxer\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "no s'ha pogut escriure al subprocés «grep»"
"la variable d'entorn «TEXTDOMAINDIR».\n"
"Directori estàndard de recerca: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<entrada estàndard>"
msgid "iconv failure"
msgstr "ha fallat iconv()"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "error en llegir «%s»"
msgid "standard output"
msgstr "eixida estàndard"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: avís: el literal caràcter no és terminat"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: avís: el literal cadena no és terminat"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.38\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-08-18 15:22+0200\n"
"Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
# src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
# src/xget-lex.c:191 src/xgettext.c:616
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
# src/msgfmt.c:321
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "chyba pøi ètení \"%s\""
# src/message.c:1182
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "chyba pøi zápisu do souboru \"%s\""
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "chyba pøi ètení \"%s\""
# lib/error.c:91
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Neznámá systémová chyba"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
# lib/xmalloc.c:82
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "pamì» vyèerpána"
# src/message.c:1115
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
# src/msgfmt.c:892
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
# src/msgfmt.c:909
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
-# src/msgfmt.c:892
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
+# src/msgfmt.c:909
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
-# src/msgfmt.c:892
-#: src/format-python.c:391
-#, fuzzy
+# src/msgfmt.c:909
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:892
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
# src/msgfmt.c:909
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
-# src/msgfmt.c:909
-#: src/format-python.c:432
+# src/msgfmt.c:892
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
+
+# src/msgfmt.c:892
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
# src/msgfmt.c:909
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/msgfmt.c:909
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
# src/msgunfmt.c:175 src/xgettext.c:394
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
# src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
# src/msgunfmt.c:180 src/xgettext.c:399
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Autor: %s\n"
# src/gettextp.c:164
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "pøíli¹ mnoho argumentù"
# src/gettextp.c:154
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "chybí argumenty"
# src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
# src/msgunfmt.c:210 src/xgettext.c:532
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Více informací získáte pøíkazem `%s --help'.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
# src/gettextp.c:233
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" MSGID z TEXTOVÉDOMÉNY\n"
# src/gettextp.c:245
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
# src/gettextp.c:255 src/msgcmp.c:200 src/msgfmt.c:386 src/msgmerge.c:331
# src/msgunfmt.c:234 src/xgettext.c:582
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"(pouze\n"
"anglicky), pøipomínky k pøekladu zasílejte na adresu <cs@li.org> (èesky).\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
# src/xgettext.c:378 src/xgettext.c:382
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s a %s se vzájemnì vyluèují"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
"v souborech bude ponecháno ze v¹ech .po souborù.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version vypí¹e oznaèení verze a ukonèí se\n"
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
msgstr ""
# src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "vstupní soubory nejsou zadány"
# src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
# src/msgcmp.c:186
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"va¹em programu. Pokud pøi porovnávání nejsou zprávy pøesnì shodné, zkoumá se,\n"
"zda si nejsou podobné.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
msgstr ""
# src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "tato zpráva je pou¾ita, ale nikoli definována..."
# src/msgcmp.c:261 src/msgmerge.c:713
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...ale tato definice je podobná"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgcmp.c:281
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "upozornìní: tato zpráva není pou¾ita"
# src/po-lex.c:84
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[2] "nalezeno %d záva¾ných chyb"
# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "dvojnásobná definice zprávy"
# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...toto je umístìní první definice"
msgstr ""
# src/msgmerge.c:303
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
# src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "vstupní soubor není zadán"
# src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
msgstr ""
# src/gettextp.c:154
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "chybí argumenty"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "musí být zadány nejménì dva rùzné soubory"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+# src/gettextp.c:154
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "chybí argumenty"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "musí být zadány nejménì dva rùzné soubory"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr ""
# src/msgmerge.c:303
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version vypí¹e oznaèení verze a ukonèí se\n"
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
# src/msgfmt.c:343
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[2] "%d pøelo¾ených zpráv"
# src/msgfmt.c:345
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[2] ", %d neúplných pøekladù"
# src/msgfmt.c:347
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[1] ", %d nepøelo¾ené zprávy"
msgstr[2] ", %d nepøelo¾ených zpráv"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
# src/po-lex.c:332
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "neplatná øídící sekvence"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
+# src/msgcmp.c:267 src/msgmerge.c:740
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+# src/msgcmp.c:267 src/msgmerge.c:740
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
# src/msgfmt.c:870
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
# src/msgfmt.c:870
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
# src/msgfmt.c:870
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
# src/msgfmt.c:878
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
# src/msgfmt.c:561
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
# src/msgfmt.c:564
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku"
# src/msgfmt.c:573
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
# src/msgfmt.c:583
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
"%*s upozornìní: pøevod znakové sady nebude fungovat"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"V hlavièce chybí definice znakové sady.\n"
"Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
"%*s upozornìní: pøevod znakové sady nebude fungovat"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
# src/msgfmt.c:471
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
# src/msgfmt.c:476
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"pøedpona"
# src/msgfmt.c:489
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "pøíkaz `domain %s' ignorován"
# src/msgfmt.c:517
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "prázdná polo¾ka `msgstr' ignorována"
# src/msgfmt.c:518
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "neúplná polo¾ka `msgstr' ignorována"
# src/msgfmt.c:668
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
msgstr ""
# src/msgmerge.c:303
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version vypí¹e oznaèení verze a ukonèí se\n"
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: upozornìní: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
"a iconv() \"%s\" nepodporuje.\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
"Tato verze byla kompilována bez iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
# src/msgmerge.c:321
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"základì podobnosti vzorù. Tím je dosa¾eno lep¹ího slití obou katalogù.\n"
" Není-li výstupní soubor urèen, výsledek bude vypisován na standardní výstup.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
msgstr ""
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
# src/msgmerge.c:769
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"chybí %ld, zastaralých %ld.\n"
# src/msgmerge.c:775
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " dokonèeno.\n"
"v promìnné prostøedí TEXTDOMAINDIR.\n"
" Adresáø, ve kterém se hledá: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<standardní vstup>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: upozornìní: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Oznaèení znakové sady \"%s\" není portabilní název kódování. \n"
"Pøevod znakù do u¾ivatelské znakové sady nebude fungovat.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Pokraèuji, pøedpokládána chyba parsingu."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Pokraèuji."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
"a iconv() \"%s\" nepodporuje.\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Instalace GNU libiconv a následná reinstalace GNU gettextu\n"
"mù¾e napravit tento problém.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
"Tato verze byla kompilována bez iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"V hlavièce chybí definice znakové sady.\n"
"Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "nekonzistentní pou¾ití #~"
# ../../src/po-gram.y:83
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "chybí sekce `msgstr[]'"
# ../../src/po-gram.y:83
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "chybí sekce `msgid_plural'"
# ../../src/po-gram.y:83
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "chybí sekce `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "první mno¾né èíslo má nenulový index"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "mno¾né èíslo má chybný index"
msgid "too many errors, aborting"
msgstr "pøíli¹ mnoho chyb, konèím"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "neplatná víceznaková sekvence"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "neplatná víceznaková sekvence"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "neplatná víceznaková sekvence"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "chyba pøi ètení \"%s\""
# src/po-lex.c:241
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "klíèové slovo \"%s\" není známo"
# src/po-lex.c:332
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "neplatná øídící sekvence"
# src/po-lex.c:420
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "konec souboru uprostøed øetìzce"
# src/po-lex.c:415
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "konec øádku uprostøed øetìzce"
# src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "soubor \"%s\" je useknutý"
# src/msgunfmt.c:298
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "posun v souboru \"%s\" na pozici %ld selhal"
# src/msgunfmt.c:373
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
# src/msgunfmt.c:373
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "soubor \"%s\" není v GNU .mo formátu"
-#: src/write-java.c:1108
+# src/gettextp.c:164
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "pøíli¹ mnoho argumentù"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+# src/message.c:1182
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "chyba pøi zápisu do souboru \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
# src/message.c:1115
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
# src/message.c:1182
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "chyba pøi zápisu do souboru \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
# src/message.c:784
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
msgstr ""
# src/message.c:1115
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "výstupní soubor \"%s\" nelze vytvoøit"
# src/message.c:1122
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standardní výstup"
# src/xget-lex.c:892
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
# src/xget-lex.c:914
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
# src/xgettext.c:658 src/xgettext.c:968
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
msgstr ""
# src/xgettext.c:386
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
# src/xgettext.c:501
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
msgstr ""
# src/msgmerge.c:303
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -w, --width=ÈÍSLO nastaví ¹íøku výstupní stránky\n"
# src/xget-lex.c:150
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standardní vstup"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
msgstr ""
# src/xgettext.c:1342
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "jazyk `%s' není znám"
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
+
+# src/msgfmt.c:909
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
+
# src/msgfmt.c:407
#~ msgid "while creating hash table"
#~ msgstr "pøi tvorbì ha¹ovací tabulky"
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-22 12:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-22 18:32+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
msgid "error after reading \"%s\""
msgstr "fejl efter læsning af '%s'"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Ukendt systemfejl"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid"
+"\""
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
msgstr ""
"formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\""
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
msgstr ""
"formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid"
-"\""
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address adresser for værtsnavnet\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "kunne ikke hente værtsnavn"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "Højst én inddatalinje tilladt"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s udelukker hinanden"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
"Hvis et langt tilvalg kræver et argument, gælder det også for det tilsvarende\n"
"korte tilvalg.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Hvis ingen inddatafil er angivet eller den er -, læses fra standard-inddata.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr ""
"%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
"flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Udtrækker alle beskeder i et beskedskatalog som matcher et vist\n"
"mønster eller hører til en given kildetekstfil.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FIL hent MØNSTER fra FIL\n"
" -i, --ignore-case versalufølsomt\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output generér sorteret uddata\n"
" --sort-by-file sortér uddata efter filplacering\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "skrivning til grep-underproces mislykkedes"
msgid "iconv failure"
msgstr "iconv-fejl"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "fejl ved læsning af '%s'"
msgid "standard output"
msgstr "standard-uddata"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-14 21:20+0100\n"
"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
"Language-Team: German <de@li.org>\n"
msgid "error after reading \"%s\""
msgstr "Fehler nach dem Lesen von »%s«"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Unbekannter Systemfehler"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "Anzahl der Formatelemente in »msgid« und »%s« stimmt nicht überein"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr ""
"Formatelemente in »msgid« und »%s« für Argument %u sind nicht identisch"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr "ein Formatelement für Argument %u, wie in »%s«, fehlt in »msgid«"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "ein Formatelement für Argument »%u« fehlt in »%s«"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "ein Formatelement für Argument {%u}, wie in »%s«, fehlt in »msgid«"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "ein Formatelement für Argument {%u} fehlt in »%s«"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
msgstr ""
"Formatelemente in »msgid« und »%s« für Argument »%s« stimmen nicht überein"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "ein Formatelement für Argument »%u« fehlt in »%s«"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "ein Formatelement für Argument %u, wie in »%s«, fehlt in »msgid«"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address Adressen für den Rechnernamen\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "höchstens eine Eingabedatei erlaubt"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s und %s schließen sich gegenseitig aus"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
"Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
"notwendig.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"gelesen.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[0] "es ist %d fataler Fehler aufgetreten"
msgstr[1] "es sind %d fatale Fehler aufgetreten"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "Mehrfachdefinition der Meldung"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...dies ist die Stelle der ersten Definition"
msgstr ""
"»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Im Kopfeintrag fehlt das Feld »%s«"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Feld »%s« im Kopfeintrag sollte in der ersten Spalte anfangen"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
"Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "Feld »%s« hat immer noch den anfänglichen Vorgabewert"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n"
# = Konvertierung der Meldung in Hinblick auf den Zeichensatz
# 2001-03-11 20:56:03 CET -ke-
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "»domain %s«-Anweisung wird ignoriert"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "leerer »msgstr«-Eintrag wird ignoriert"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
"Option »%c« kann nicht verwendet werden, bevor »K« or »T« festgelegt ist"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
# To avoid confusion, let msgid and msgstr untranslated here!
# 2001-11-04 11:16:55 CET -ke-
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FILE MUSTER der DATEI entnehmen\n"
" -i, --ignore-case Groß-/Kleinschreibung nicht unterscheiden\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output sortierte Ausgabe erzeugen\n"
" --sort-by-file Ausgabe gemäß Vorkommen in Dateien erzeugen\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "Schreiben zum Subprozess grep fehlgeschlagen"
msgid "English translations for %s package"
msgstr "German messages for %s"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "momentaner Zeichensatz »%s« ist kein Name für eine portable Kodierung"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in der Eingabedatei"
"Bereich »%s« in der Eingabedatei »%s« ohne Kopfeintrag mit der Zeichensatz-"
"Angabe"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "gewünschter Zeichensatz »%s« ist kein Name für eine portable Kodierung"
"Ausgabe von '%s' könnte nicht korrekt sein.\n"
"Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "Fehler bei der Konvertierung"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "Eingabedatei ohne Kopfeintrag mit der Zeichensatz-Angabe"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
"%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"\n"
"Standardverzeichnis: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
msgid "iconv failure"
msgstr "Fehler von iconv"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "Fehler beim Lesen von »%s«"
msgid "standard output"
msgstr "Standardausgabe"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt beendet"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
#
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
#
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
#
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
#
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
#
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
#
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
#
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
#, fuzzy
msgid "memory exhausted"
msgstr "H ìíÞìç åîáíôëÞèçêå"
#
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
#
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
#
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr ""
-"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr ""
-"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
#
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr ""
+"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
+
+#
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr ""
+"ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
#
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
#
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
#
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
#
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
#
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "õðïëåßðïíôáé ïñßóìáôá"
#
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
#
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" óôï MSGID áðü ôï TEXTDOMAIN\n"
#
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
#
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
"èá äéáôçñçèïýí.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
msgstr ""
#
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ"
#
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
#
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"Ý÷ïõí ìåôáöñáóôåß. Åêåß ðïõ äåí åíôïðßæåôáé áêñéâÞò áíôéóôoé÷ßá,\n"
"ãßíåôáé åëáóôéêü ôáßñéáóìá ãéá êáëýôåñá áðïôåëÝóìáôá.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
msgstr ""
#
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..."
#
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò"
#
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
#
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá"
#
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò"
#
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
msgstr ""
#
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
#
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
#
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
msgstr ""
#
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "õðïëåßðïíôáé ïñßóìáôá"
-#
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "õðïëåßðïíôáé ïñßóìáôá"
+
+#
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr ""
#
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
#
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá"
#
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
#
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
+#
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
+msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
+#
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
+msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
#
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
#
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
#
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
#
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò"
#
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
#
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
#
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
#
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
#
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
#
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"ãßíåé ÷ñÞóç ðñïèÝìáôïò"
#
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
#
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
#
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
#
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
msgstr ""
#
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
#
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"Ôá áðïôåëÝóìáôá ãñÜöïíôáé óôçí êáíïíéêÞ Ýîïäï åêôüò êáé áí ïñßæåôáé\n"
"êÜðïéï áñ÷åßï åîüäïõ.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
msgstr ""
#
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
#
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n"
#
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " Ýãéíå.\n"
"Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n"
"ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
#
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
msgstr ""
#
-#: src/po-charset.c:295
+#: src/po-charset.c:335
#, fuzzy
msgid ""
"Charset missing in header.\n"
msgstr ""
"%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
#
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "ëåßðåé åíüôçôá `msgstr'"
#
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "ëåßðåé åíüôçôá `msgstr'"
#
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "ëåßðåé åíüôçôá `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù"
#
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
#, fuzzy
msgid "invalid multibyte sequence"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
#
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
#
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
#
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
#
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "Üãíùóôç åíôïëÞ \"%s\""
#
-#: src/po-lex.c:939
+#: src/po-lex.c:965
#, fuzzy
msgid "invalid control sequence"
msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
#
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "ôÝëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
#
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
#
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïýí äåäïìÝíá óå áõôü"
#
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "ç ðñüóâáóç óôï áñ÷åßï \"%s\", èÝóç %ld, áðÝôõ÷å"
#
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
#
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
-#: src/write-java.c:1108
+#
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
#
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
#
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
#
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
"ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%"
"c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
msgstr ""
#
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
#
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "êáíïíéêÞ Ýîïäïò"
#
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
#
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
#
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
msgstr ""
#
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí "
"êáíïíéêÞ Ýîïäï"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
#
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
msgstr ""
#
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -w, --width=ÁÑÉÈÌÏÓ ïñéóìüò ìåãÝèïõò ðëÜôïõò óåëßäáò åîüäïõ\n"
#
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "êáíïíéêÞ åßóïäïò"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
msgstr ""
#
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
+#
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
+
+#
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
+
+#
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
+
#
#~ msgid "while creating hash table"
#~ msgstr "êáôÜ ôç äçìéïõñãßá ôïõ hash table"
# English translations for GNU gettext package.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Automatically generated, 2001.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2002.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext 0.11-pre2\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
-"PO-Revision-Date: 2001-11-30 14:18+0100\n"
+"Project-Id-Version: GNU gettext 0.11\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
+"PO-Revision-Date: 2002-01-31 15:34+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr "invalid argument ‘\e[1m%s\e[0m’ for ‘\e[1m%s\e[0m’"
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr "ambiguous argument ‘\e[1m%s\e[0m’ for ‘\e[1m%s\e[0m’"
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr "Valid arguments are:"
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error while opening “\e[1m%s\e[0m” for reading"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "cannot open backup file “\e[1m%s\e[0m” for writing"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, c-format
msgid "error reading \"%s\""
msgstr "error reading “\e[1m%s\e[0m”"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, c-format
msgid "error writing \"%s\""
msgstr "error writing “\e[1m%s\e[0m”"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, c-format
msgid "error after reading \"%s\""
msgstr "error after reading “\e[1m%s\e[0m”"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Unknown system error"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr "%s subprocess failed"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: option ‘\e[1m-W %s\e[0m’ doesn't allow an argument\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java compiler not found, try installing gcj or set $JAVAC"
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java virtual machine not found, try installing gij or set $JAVA"
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "memory exhausted"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
msgid "cannot create pipe"
msgstr "cannot create pipe"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr "%s subprocess"
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
-msgstr "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s subprocess got fatal signal %d"
-#: src/format-c.c:578 src/format-python.c:463
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
-"number of format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ does not "
+"number of format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1m%s\e[0m’ does not "
"match"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ for argument %u "
-"are not the same"
+"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1m%s\e[0m’ for argument %u are "
+"not the same"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr ""
-"a format specification for argument {%u} doesn't exist in ‘\e[1mmsgid\e[0m’"
+"a format specification for argument %u, as in '%s', doesn't exist in "
+"‘\e[1mmsgid\e[0m’"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "a format specification for argument %u doesn't exist in ‘\e[1m%s\e[0m’"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-java.c:660
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-"a format specification for argument {%u} doesn't exist in ‘\e[1mmsgstr\e[0m’"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"‘\e[1mmsgid\e[0m’"
+
+#: src/format-java.c:675
+#, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "a format specification for argument {%u} doesn't exist in ‘\e[1m%s\e[0m’"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:700
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr ""
+"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1m%s\e[0m’ for argument {%u} are "
+"not the same"
+
+#: src/format-lisp.c:3381
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ for argument {%u} "
-"are not the same"
+"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1m%s\e[0m’ are not equivalent"
-#: src/format-lisp.c:3371
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-lisp.c:3402
+#, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ are not equivalent"
+"format specifications in ‘\e[1m%s\e[0m’ are not a subset of those in ‘\e[1mmsgid\e"
+"[0m’"
-#: src/format-python.c:391
+#: src/format-python.c:397
+#, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ expect a mapping, those in ‘\e[1mmsgstr\e"
-"[0m’ expect a tuple"
+"format specifications in ‘\e[1mmsgid\e[0m’ expect a mapping, those in ‘\e[1m%s\e[0m’ "
+"expect a tuple"
-#: src/format-python.c:399
+#: src/format-python.c:409
+#, c-format
msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
"mapping"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ expect a tuple, those in ‘\e[1mmsgstr\e"
-"[0m’ expect a mapping"
+"format specifications in ‘\e[1mmsgid\e[0m’ expect a tuple, those in ‘\e[1m%s\e[0m’ "
+"expect a mapping"
-#: src/format-python.c:422
+#: src/format-python.c:437
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-"a format specification for argument ‘\e[1m%s\e[0m’ doesn't exist in ‘\e[1mmsgid\e[0m’"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"‘\e[1mmsgid\e[0m’"
-#: src/format-python.c:432
+#: src/format-python.c:452
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr ""
-"a format specification for argument ‘\e[1m%s\e[0m’ doesn't exist in ‘\e[1mmsgstr\e"
-"[0m’"
+"a format specification for argument ‘\e[1m%s\e[0m’ doesn't exist in ‘\e[1m%s\e[0m’"
-#: src/format-python.c:446
+#: src/format-python.c:478
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr ""
-"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ for argument ‘\e[1m%s\e"
+"format specifications in ‘\e[1mmsgid\e[0m’ and ‘\e[1m%s\e[0m’ for argument ‘\e[1m%s\e"
"[0m’ are not the same"
-#: src/format-ycp.c:137
-#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-msgstr "a format specification for argument %u doesn't exist in ‘\e[1mmsgstr\e[0m’"
-
-#: src/format-ycp.c:138
-#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
-msgstr "a format specification for argument %u doesn't exist in ‘\e[1mmsgid\e[0m’"
-
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Written by %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "too many arguments"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "missing arguments"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try ‘\e[1m%s --help\e[0m’ for more information.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr "Display native language translation of a textual message.\n"
-#: src/gettext.c:266
+#: src/gettext.c:255
#, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
" to MSGID from TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"found in the selected catalog are translated.\n"
"Standard search directory: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Usage: %s [OPTION]\n"
" and aliases\n"
" -i, --ip-address addresses for the hostname\n"
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr "could not get host name"
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "at most one input file allowed"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s and %s are mutually exclusive"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Mandatory arguments to long options are mandatory for short options too.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If no input file is given or if it is -, standard input is read.\n"
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "impossible selection criteria specified (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
"is specified, they will be taken from the first PO file to define them.\n"
"File positions from all PO files will be cumulated.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n"
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "no input files given"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "exactly 2 input files required"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Usage: %s [OPTION] def.po ref.pot\n"
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" ref.pot references to the sources\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "this message is used but not defined..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...but this definition is similar"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "this message is used but not defined in %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "warning: this message is not used"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "found %d fatal error"
msgstr[1] "found %d fatal errors"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "duplicate message definition"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...this is the location of the first definition"
" -t, --to-code=NAME encoding for output\n"
"The default encoding is the current locale's encoding.\n"
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "no input file given"
-#: src/msgen.c:192
+#: src/msgen.c:191
msgid "exactly one input file required"
msgstr "exactly one input file required"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Usage: %s [OPTION] INPUTFILE\n"
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"xgettext). Untranslated entries are assigned a translation that is\n"
"identical to the msgid, and are marked fuzzy.\n"
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If input file is -, standard input is read.\n"
-#: src/msgexec.c:255
-msgid "missing filter name"
-msgstr "missing filter name"
+#: src/msgexec.c:180
+msgid "missing command name"
+msgstr "missing command name"
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
-msgstr "at least one sed script must be specified"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+"A special builtin command called ‘\e[1m0\e[0m’ outputs the translation, followed by a\n"
+"null byte. The output of “\e[1mmsgexec 0\e[0m” is suitable as input for “\e[1mxargs -0\e[0m”.\n"
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If no input file is given or if it is -, standard input is read.\n"
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr "write to stdout failed"
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "write to %s subprocess failed"
+
+#: src/msgfilter.c:263
+msgid "missing filter name"
+msgstr "missing filter name"
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr "at least one sed script must be specified"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr "Applies a filter to all translations of a translation catalog.\n"
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" to be executed\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress ‘\e[1m#: filename:line\e[0m’ lines\n"
" --add-location preserve ‘\e[1m#: filename:line\e[0m’ lines (default)\n"
" --strict strict Uniforum output style\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "cannot set up nonblocking I/O to %s subprocess"
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr "communication with %s subprocess failed"
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "write to %s subprocess failed"
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr "read from %s subprocess failed"
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "%s subprocess terminated with exit code %d"
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "the argument to %s should be a single punctuation character"
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requires a “\e[1m-d directory\e[0m” specification"
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr "%s is only valid with %s"
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d translated message"
msgstr[1] "%d translated messages"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d fuzzy translation"
msgstr[1] ", %d fuzzy translations"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d untranslated message"
msgstr[1] ", %d untranslated messages"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Usage: %s [OPTION] filename.po ...\n"
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Generate binary message catalog from textual translation description.\n"
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If input file is -, standard input is read.\n"
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" -j, --java Java mode: generate a Java ResourceBundle class\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
" --strict enable strict Uniforum mode\n"
"If output file is -, output is written to standard output.\n"
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" menu items\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
" --no-hash binary file will not include the hash table\n"
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" --statistics print statistics about translations\n"
" -v, --verbose increase verbosity level\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr "plural expression can produce negative values"
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu but plural expression can produce values as large as %lu"
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr "plural expression can produce division by zero"
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr "plural expression can produce integer overflow"
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr "message catalog has plural form translations..."
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...but header entry lacks a “\e[1mplural=EXPRESSION\e[0m” attribute"
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...but header entry lacks a “\e[1mnplurals=INTEGER\e[0m” attribute"
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
msgid "invalid nplurals value"
msgstr "invalid nplurals value"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr "invalid plural expression"
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr "...but some messages have only %lu plural forms"
-
#: src/msgfmt.c:915
#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr "...but some messages have %lu plural forms"
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "...but some messages have only one plural form"
+msgstr[1] "...but some messages have only %lu plural forms"
#: src/msgfmt.c:930
+#, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "...but some messages have one plural form"
+msgstr[1] "...but some messages have %lu plural forms"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
"message catalog has plural form translations, but lacks a header entry with "
"“\e[1mPlural-Forms: nplurals=INTEGER; plural=EXPRESSION;\e[0m”"
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgid_plural\e[0m’ entries do not both begin with ‘\e[1m\\n\e"
"[0m’"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr[%u]\e[0m’ entries do not both begin with ‘\e[1m\\n\e"
"[0m’"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ entries do not both begin with ‘\e[1m\\n\e[0m’"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgid_plural\e[0m’ entries do not both end with ‘\e[1m\\n\e"
"[0m’"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr[%u]\e[0m’ entries do not both end with ‘\e[1m\\n\e[0m’"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
"‘\e[1mmsgid\e[0m’ and ‘\e[1mmsgstr\e[0m’ entries do not both end with ‘\e[1m\\n\e[0m’"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr "plural handling is a GNU gettext extension"
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
-msgstr "‘\e[1mmsgstr\e[0m’ is not a valid %s format string, unlike ‘\e[1mmsgid\e[0m’"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+msgstr "‘\e[1m%s\e[0m’ is not a valid %s format string, unlike ‘\e[1mmsgid\e[0m’"
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr lacks the keyboard accelerator mark ‘\e[1m%c\e[0m’"
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr has too many keyboard accelerator marks ‘\e[1m%c\e[0m’"
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "headerfield ‘\e[1m%s\e[0m’ missing in header"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "header field ‘\e[1m%s\e[0m’ should start at beginning of line"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "some header fields still have the initial default value"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "field ‘\e[1m%s\e[0m’ still has initial default value"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "warning: PO file header missing or invalid\n"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "warning: charset conversion will not work\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "warning: PO file header fuzzy\n"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "warning: older versions of msgfmt will give an error on this\n"
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain name “\e[1m%s\e[0m” not suitable as file name"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain name “\e[1m%s\e[0m” not suitable as file name: will use prefix"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "‘\e[1mdomain %s\e[0m’ directive ignored"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "empty ‘\e[1mmsgstr\e[0m’ entry ignored"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "fuzzy ‘\e[1mmsgstr\e[0m’ entry ignored"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: warning: source file contains fuzzy translation"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
"option ‘\e[1m%c\e[0m’ cannot be used before ‘\e[1mK\e[0m’ or ‘\e[1mT\e[0m’ has been "
"specified"
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output generate sorted output\n"
" --sort-by-file sort output by file location\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "write to grep subprocess failed"
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr "Created %s.\n"
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given, the current directory is searched for the POT file.\n"
"If it is -, standard input is read.\n"
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" --no-translator assume the PO file is automatically generated\n"
" -w, --width=NUMBER set output page width\n"
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr "error reading current directory"
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr "fdopen() failed"
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s subprocess I/O error"
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s subprocess failed with exit code %d"
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr "English translations for %s package"
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "present charset “\e[1m%s\e[0m” is not a portable encoding name"
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "two different charsets “\e[1m%s\e[0m” and “\e[1m%s\e[0m” in input file"
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
"input file ‘\e[1m%s\e[0m’ doesn't contain a header entry with a charset "
"specification"
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"domain “\e[1m%s\e[0m” in input file ‘\e[1m%s\e[0m’ doesn't contain a header entry "
"with a charset specification"
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "target charset “\e[1m%s\e[0m” is not a portable encoding name."
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr "warning: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Output of ‘\e[1m%s\e[0m’ might be incorrect.\n"
"Possible workarounds are:\n"
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Set LC_ALL to a locale with encoding %s.\n"
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"Output of ‘\e[1m%s\e[0m’ might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "conversion failure"
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "input file doesn't contain a header entry with a charset specification"
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Cannot convert from “\e[1m%s\e[0m” to “\e[1m%s\e[0m”. %s relies on iconv(), and iconv"
"() does not support this conversion."
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Cannot convert from “\e[1m%s\e[0m” to “\e[1m%s\e[0m”. %s relies on iconv(). This "
"version was built without iconv()."
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr "backup type"
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"The backup suffix is ‘\e[1m~\e[0m’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
" -q, --quiet, --silent suppress progress indicators\n"
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
msgid "this message should define plural forms"
msgstr "this message should define plural forms"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
msgid "this message should not define plural forms"
msgstr "this message should not define plural forms"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " done.\n"
"variable TEXTDOMAINDIR.\n"
"Standard search directory: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: warning: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Charset “\e[1m%s\e[0m” is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Continuing anyway, expect parse errors."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Continuing anyway."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Charset “\e[1m%s\e[0m” is not supported. %s relies on iconv(),\n"
"and iconv() does not support “\e[1m%s\e[0m”.\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Charset “\e[1m%s\e[0m” is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "inconsistent use of #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "missing ‘\e[1mmsgstr[]\e[0m’ section"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "missing ‘\e[1mmsgid_plural\e[0m’ section"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "missing ‘\e[1mmsgstr\e[0m’ section"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "first plural form has nonzero index"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "plural form has wrong index"
msgid "too many errors, aborting"
msgstr "too many errors, aborting"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "invalid multibyte sequence"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr "incomplete multibyte sequence at end of file"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr "incomplete multibyte sequence at end of line"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr "iconv failure"
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "error while reading “\e[1m%s\e[0m”"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "keyword “\e[1m%s\e[0m” unknown"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "invalid control sequence"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "end-of-file within string"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "end-of-line within string"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "file “\e[1m%s\e[0m” truncated"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "seek “\e[1m%s\e[0m” offset %ld failed"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file “\e[1m%s\e[0m” contains a not NUL terminated string"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file “\e[1m%s\e[0m” is not in GNU .mo format"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+msgid "expected two arguments"
+msgstr "expected two arguments"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr "Usage: %s [OPTION] URL FILE\n"
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+
+#: src/urlget.c:222
+msgid "error writing stdout"
+msgstr "error writing stdout"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "cannot find a temporary directory, try setting $TMPDIR"
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "cannot create a temporary directory using template “\e[1m%s\e[0m”"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr "not a valid Java class name: %s"
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr "failed to create “\e[1m%s\e[0m”"
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "error while writing “\e[1m%s\e[0m” file"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "error while opening “\e[1m%s\e[0m” for writing"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
"internationalized messages should not contain the ‘\e[1m\\%c\e[0m’ escape "
"sequence"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "cannot create output file “\e[1m%s\e[0m”"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standard output"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: warning: unterminated character constant"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: warning: unterminated string literal"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "this file may not contain domain directives"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: invalid string expression"
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing cannot be used when output is written to stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext cannot work without keywords to look for"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "warning: file ‘\e[1m%s\e[0m’ extension ‘\e[1m%s\e[0m’ is unknown; will try C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr "Extract translatable strings from given input files.\n"
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
"If output file is -, output is written to standard output.\n"
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" -T, --trigraphs understand ANSI C trigraphs for input\n"
" --debug more detailed formatstring recognition result\n"
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with ‘\e[1mmsgid \"\"\e[0m’ entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "language ‘\e[1m%s\e[0m’ unknown"
# English translations for GNU gettext package.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Automatically generated, 2001.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2002.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext 0.11-pre2\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
-"PO-Revision-Date: 2001-11-30 14:18+0100\n"
+"Project-Id-Version: GNU gettext 0.11\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
+"PO-Revision-Date: 2002-01-31 15:34+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr "invalid argument ‘%s’ for ‘%s’"
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr "ambiguous argument ‘%s’ for ‘%s’"
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr "Valid arguments are:"
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error while opening “%s” for reading"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "cannot open backup file “%s” for writing"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, c-format
msgid "error reading \"%s\""
msgstr "error reading “%s”"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, c-format
msgid "error writing \"%s\""
msgstr "error writing “%s”"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, c-format
msgid "error after reading \"%s\""
msgstr "error after reading “%s”"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Unknown system error"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr "%s subprocess failed"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java compiler not found, try installing gcj or set $JAVAC"
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java virtual machine not found, try installing gij or set $JAVA"
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "memory exhausted"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
msgid "cannot create pipe"
msgstr "cannot create pipe"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr "%s subprocess"
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
-msgstr "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s subprocess got fatal signal %d"
-#: src/format-c.c:578 src/format-python.c:463
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
-msgstr "number of format specifications in ‘msgid’ and ‘msgstr’ does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgstr "number of format specifications in ‘msgid’ and ‘%s’ does not match"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr ""
-"format specifications in ‘msgid’ and ‘msgstr’ for argument %u are not the "
-"same"
+"format specifications in ‘msgid’ and ‘%s’ for argument %u are not the same"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
-msgstr "a format specification for argument {%u} doesn't exist in ‘msgid’"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"a format specification for argument %u, as in '%s', doesn't exist in ‘msgid’"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-msgstr "a format specification for argument {%u} doesn't exist in ‘msgstr’"
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "a format specification for argument %u doesn't exist in ‘%s’"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-"format specifications in ‘msgid’ and ‘msgstr’ for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"‘msgid’"
-#: src/format-lisp.c:3371
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "format specifications in ‘msgid’ and ‘msgstr’ are not equivalent"
+#: src/format-java.c:675
+#, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "a format specification for argument {%u} doesn't exist in ‘%s’"
-#: src/format-python.c:391
+#: src/format-java.c:700
+#, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
msgstr ""
-"format specifications in ‘msgid’ expect a mapping, those in ‘msgstr’ expect "
-"a tuple"
+"format specifications in ‘msgid’ and ‘%s’ for argument {%u} are not the same"
-#: src/format-python.c:399
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
-msgstr ""
-"format specifications in ‘msgid’ expect a tuple, those in ‘msgstr’ expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgstr "format specifications in ‘msgid’ and ‘%s’ are not equivalent"
+
+#: src/format-lisp.c:3402
+#, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "format specifications in ‘%s’ are not a subset of those in ‘msgid’"
-#: src/format-python.c:422
+#: src/format-python.c:397
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
-msgstr "a format specification for argument ‘%s’ doesn't exist in ‘msgid’"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr ""
+"format specifications in ‘msgid’ expect a mapping, those in ‘%s’ expect a "
+"tuple"
-#: src/format-python.c:432
+#: src/format-python.c:409
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "a format specification for argument ‘%s’ doesn't exist in ‘msgstr’"
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr ""
+"format specifications in ‘msgid’ expect a tuple, those in ‘%s’ expect a "
+"mapping"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-"format specifications in ‘msgid’ and ‘msgstr’ for argument ‘%s’ are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"‘msgid’"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-msgstr "a format specification for argument %u doesn't exist in ‘msgstr’"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgstr "a format specification for argument ‘%s’ doesn't exist in ‘%s’"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
-msgstr "a format specification for argument %u doesn't exist in ‘msgid’"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+msgstr ""
+"format specifications in ‘msgid’ and ‘%s’ for argument ‘%s’ are not the same"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Written by %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "too many arguments"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "missing arguments"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Try ‘%s --help’ for more information.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr "Display native language translation of a textual message.\n"
-#: src/gettext.c:266
+#: src/gettext.c:255
#, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
" to MSGID from TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"found in the selected catalog are translated.\n"
"Standard search directory: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Usage: %s [OPTION]\n"
" and aliases\n"
" -i, --ip-address addresses for the hostname\n"
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr "could not get host name"
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "at most one input file allowed"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s and %s are mutually exclusive"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Mandatory arguments to long options are mandatory for short options too.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If no input file is given or if it is -, standard input is read.\n"
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "impossible selection criteria specified (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
"is specified, they will be taken from the first PO file to define them.\n"
"File positions from all PO files will be cumulated.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -h, --help display this help and exit\n"
" -V, --version output version information and exit\n"
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "no input files given"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "exactly 2 input files required"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Usage: %s [OPTION] def.po ref.pot\n"
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" ref.pot references to the sources\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "this message is used but not defined..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...but this definition is similar"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "this message is used but not defined in %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "warning: this message is not used"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "found %d fatal error"
msgstr[1] "found %d fatal errors"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "duplicate message definition"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...this is the location of the first definition"
" -t, --to-code=NAME encoding for output\n"
"The default encoding is the current locale's encoding.\n"
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "no input file given"
-#: src/msgen.c:192
+#: src/msgen.c:191
msgid "exactly one input file required"
msgstr "exactly one input file required"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Usage: %s [OPTION] INPUTFILE\n"
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"xgettext). Untranslated entries are assigned a translation that is\n"
"identical to the msgid, and are marked fuzzy.\n"
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If input file is -, standard input is read.\n"
-#: src/msgexec.c:255
-msgid "missing filter name"
-msgstr "missing filter name"
+#: src/msgexec.c:180
+msgid "missing command name"
+msgstr "missing command name"
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
-msgstr "at least one sed script must be specified"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+"A special builtin command called ‘0’ outputs the translation, followed by a\n"
+"null byte. The output of “msgexec 0” is suitable as input for “xargs -0”.\n"
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If no input file is given or if it is -, standard input is read.\n"
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr "write to stdout failed"
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "write to %s subprocess failed"
+
+#: src/msgfilter.c:263
+msgid "missing filter name"
+msgstr "missing filter name"
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr "at least one sed script must be specified"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr "Applies a filter to all translations of a translation catalog.\n"
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" to be executed\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress ‘#: filename:line’ lines\n"
" --add-location preserve ‘#: filename:line’ lines (default)\n"
" --strict strict Uniforum output style\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "cannot set up nonblocking I/O to %s subprocess"
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr "communication with %s subprocess failed"
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "write to %s subprocess failed"
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr "read from %s subprocess failed"
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "%s subprocess terminated with exit code %d"
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "the argument to %s should be a single punctuation character"
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requires a “-d directory” specification"
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr "%s is only valid with %s"
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d translated message"
msgstr[1] "%d translated messages"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d fuzzy translation"
msgstr[1] ", %d fuzzy translations"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d untranslated message"
msgstr[1] ", %d untranslated messages"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Usage: %s [OPTION] filename.po ...\n"
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Generate binary message catalog from textual translation description.\n"
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
"If input file is -, standard input is read.\n"
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" -j, --java Java mode: generate a Java ResourceBundle class\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
" --strict enable strict Uniforum mode\n"
"If output file is -, output is written to standard output.\n"
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" menu items\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
" --no-hash binary file will not include the hash table\n"
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" --statistics print statistics about translations\n"
" -v, --verbose increase verbosity level\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr "plural expression can produce negative values"
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu but plural expression can produce values as large as %lu"
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr "plural expression can produce division by zero"
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr "plural expression can produce integer overflow"
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr "message catalog has plural form translations..."
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "...but header entry lacks a “plural=EXPRESSION” attribute"
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "...but header entry lacks a “nplurals=INTEGER” attribute"
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
msgid "invalid nplurals value"
msgstr "invalid nplurals value"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr "invalid plural expression"
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu..."
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr "...but some messages have only %lu plural forms"
-
#: src/msgfmt.c:915
#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr "...but some messages have %lu plural forms"
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "...but some messages have only one plural form"
+msgstr[1] "...but some messages have only %lu plural forms"
#: src/msgfmt.c:930
+#, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "...but some messages have one plural form"
+msgstr[1] "...but some messages have %lu plural forms"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
"message catalog has plural form translations, but lacks a header entry with "
"“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n’"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n’"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n’"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr "plural handling is a GNU gettext extension"
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
-msgstr "‘msgstr’ is not a valid %s format string, unlike ‘msgid’"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+msgstr "‘%s’ is not a valid %s format string, unlike ‘msgid’"
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "headerfield ‘%s’ missing in header"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "header field ‘%s’ should start at beginning of line"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "some header fields still have the initial default value"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "field ‘%s’ still has initial default value"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "warning: PO file header missing or invalid\n"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "warning: charset conversion will not work\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "warning: PO file header fuzzy\n"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "warning: older versions of msgfmt will give an error on this\n"
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain name “%s” not suitable as file name"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain name “%s” not suitable as file name: will use prefix"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "‘domain %s’ directive ignored"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "empty ‘msgstr’ entry ignored"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "fuzzy ‘msgstr’ entry ignored"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: warning: source file contains fuzzy translation"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "option ‘%c’ cannot be used before ‘K’ or ‘T’ has been specified"
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output generate sorted output\n"
" --sort-by-file sort output by file location\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "write to grep subprocess failed"
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr "Created %s.\n"
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given, the current directory is searched for the POT file.\n"
"If it is -, standard input is read.\n"
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" --no-translator assume the PO file is automatically generated\n"
" -w, --width=NUMBER set output page width\n"
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr "error reading current directory"
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr "fdopen() failed"
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s subprocess I/O error"
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s subprocess failed with exit code %d"
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr "English translations for %s package"
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "present charset “%s” is not a portable encoding name"
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "two different charsets “%s” and “%s” in input file"
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
"input file ‘%s’ doesn't contain a header entry with a charset specification"
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"domain “%s” in input file ‘%s’ doesn't contain a header entry with a charset "
"specification"
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "target charset “%s” is not a portable encoding name."
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr "warning: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Output of ‘%s’ might be incorrect.\n"
"Possible workarounds are:\n"
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Set LC_ALL to a locale with encoding %s.\n"
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"Output of ‘%s’ might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "conversion failure"
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "input file doesn't contain a header entry with a charset specification"
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv() does not "
"support this conversion."
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Cannot convert from “%s” to “%s”. %s relies on iconv(). This version was "
"built without iconv()."
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr "backup type"
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"The backup suffix is ‘~’, unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
" -q, --quiet, --silent suppress progress indicators\n"
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
msgid "this message should define plural forms"
msgstr "this message should define plural forms"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
msgid "this message should not define plural forms"
msgstr "this message should not define plural forms"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " done.\n"
"variable TEXTDOMAINDIR.\n"
"Standard search directory: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: warning: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Charset “%s” is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Continuing anyway, expect parse errors."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Continuing anyway."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Charset “%s” is not supported. %s relies on iconv(),\n"
"and iconv() does not support “%s”.\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Charset “%s” is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "inconsistent use of #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "missing ‘msgstr[]’ section"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "missing ‘msgid_plural’ section"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "missing ‘msgstr’ section"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "first plural form has nonzero index"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "plural form has wrong index"
msgid "too many errors, aborting"
msgstr "too many errors, aborting"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "invalid multibyte sequence"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr "incomplete multibyte sequence at end of file"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr "incomplete multibyte sequence at end of line"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr "iconv failure"
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "error while reading “%s”"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "keyword “%s” unknown"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "invalid control sequence"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "end-of-file within string"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "end-of-line within string"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "file “%s” truncated"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "seek “%s” offset %ld failed"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file “%s” contains a not NUL terminated string"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file “%s” is not in GNU .mo format"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+msgid "expected two arguments"
+msgstr "expected two arguments"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr "Usage: %s [OPTION] URL FILE\n"
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+
+#: src/urlget.c:222
+msgid "error writing stdout"
+msgstr "error writing stdout"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "cannot find a temporary directory, try setting $TMPDIR"
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "cannot create a temporary directory using template “%s”"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr "not a valid Java class name: %s"
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr "failed to create “%s”"
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "error while writing “%s” file"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "error while opening “%s” for writing"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"internationalized messages should not contain the ‘\\%c’ escape sequence"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "cannot create output file “%s”"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standard output"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: warning: unterminated character constant"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: warning: unterminated string literal"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "this file may not contain domain directives"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: invalid string expression"
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing cannot be used when output is written to stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext cannot work without keywords to look for"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr "Extract translatable strings from given input files.\n"
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
"If output file is -, output is written to standard output.\n"
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" -c, --add-comments[=TAG] place comment block with TAG (or those\n"
" preceding keyword lines) in output file\n"
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" -T, --trigraphs understand ANSI C trigraphs for input\n"
" --debug more detailed formatstring recognition result\n"
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with ‘msgid \"\"’ entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "language ‘%s’ unknown"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre3\n"
-"POT-Creation-Date: 2001-12-20 22:14+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-12-24 11:21-0500\n"
"Last-Translator: Max de Mendizábal <max@upn.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:142
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr "el argumento `%s' es inválido para `%s'"
-#: lib/argmatch.c:143
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr "el argumento `%s' es ambiguo para `%s'"
-#: lib/argmatch.c:163
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr "Los argumentos válidos son:"
-#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:734 src/read-mo.c:170
-#: src/urlget.c:204 src/xgettext.c:808 src/xgettext.c:821 src/xgettext.c:831
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "error al abrir el fichero \"%s\" para lectura"
# Nota: El error es del sistema, pero no se sabe cuál es el error,
# por eso es (además) desconocido.
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Error del sistema desconocido"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:169 lib/pipe-in.c:205 lib/pipe-out.c:169 lib/pipe-out.c:205
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr "fallo en el subproceso %s"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
"No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
"No se encontró a la máquina virtual de Java, intente instalar gij o poner "
"$JAVA"
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "Memoria agotada"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
msgid "cannot create pipe"
msgstr "no se puede crear la tubería"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr "subproceso %s"
-#: lib/wait-process.c:129
-#, c-format
-msgid "%s subprocess got fatal signal"
+#: lib/wait-process.c:124
+#, fuzzy, c-format
+msgid "%s subprocess got fatal signal %d"
msgstr "el subproceso %s tiene una señal fatal"
#: src/format-c.c:587 src/format-python.c:506
msgstr ""
"el número de especificaciones de formato en `msgid' y 'msgstr' no coincide"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
"las especificaciones de formato en 'msgid' y 'msgstr' para el argumento %u "
"no son las mismas"
-#: src/format-java.c:660 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, fuzzy, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"una especificación de formato para el argumento '%s' no existe en 'msgid'"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, fuzzy, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr ""
+"una especificación de formato para el argumento %u no existe en 'msgid'"
+
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
msgstr ""
"una especificación de formato para el argumento '%s' no existe en 'msgid'"
-#: src/format-java.c:675 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-java.c:675
#, fuzzy, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr ""
"una especificación de formato para el argumento {%u} no existe en 'msgid'"
-#: src/format-java.c:700 src/format-librep.c:353 src/format-pascal.c:443
+#: src/format-java.c:700
#, fuzzy, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"las especificaciones de formato en 'msgid' y 'msgstr' para el argumento '%s' "
"no son las mismas"
-#: src/format-ycp.c:144
-#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr ""
-"una especificación de formato para el argumento %u no existe en 'msgid'"
-
-#: src/format-ycp.c:145
-#, fuzzy, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"una especificación de formato para el argumento '%s' no existe en 'msgid'"
-
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:165 src/msgfilter.c:249 src/msgfmt.c:333 src/msggrep.c:280
-#: src/msginit.c:247 src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207
-#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:365
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:170 src/msgfilter.c:254 src/msgfmt.c:338 src/msggrep.c:285
-#: src/msginit.c:252 src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212
-#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:370
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "faltan argumentos"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:223 src/msgfilter.c:347 src/msgfmt.c:479 src/msggrep.c:375
-#: src/msginit.c:338 src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:512
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para más información.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"Modo de empleo: %s [OPCIÓN] [[DOMINIOTEXTO] MSGID]\n"
" o: %s [OPCIÓN] -s [MSGID]...\n"
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr "Mostrar la traducción a idioma nativo de un mensaje textual.\n"
# Prefiero que se quede como está, pues aunque se repite muestra,
# es en otra opción en donde aparece. mm
#
-#: src/gettext.c:266
+#: src/gettext.c:255
#, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
# Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
# no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/gettext.c:277
+#: src/gettext.c:266
#, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"encuentre dentro del catálogo seleccionado.\n"
"Directorio de búsqueda estándar: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:267 src/msgfilter.c:420 src/msgfmt.c:563 src/msggrep.c:461
-#: src/msginit.c:389 src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:605
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Modo de empleo: %s [OPCIÓN]\n"
" completo del dominio calificado,\n"
" -i, --ip-address dirección del nombre de la máquina\n"
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:261 src/msgfilter.c:414 src/msggrep.c:455
-#: src/msginit.c:383 src/urlget.c:180
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr "no se pudo obtener el nombre de la máquina"
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:199
-#: src/msggrep.c:300 src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "sólo se permite un fichero de entrada máximo"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgfilter.c:269 src/msgfilter.c:273
-#: src/msgfmt.c:358 src/msggrep.c:306 src/msggrep.c:310 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:380 src/xgettext.c:384
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s y %s son mutuamente excluyentes"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:380 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
"Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
"atributos, y luego manipula los atributos.\n"
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:248 src/msgfilter.c:362
-#: src/msgfmt.c:494 src/msggrep.c:391 src/msginit.c:354 src/msgmerge.c:390
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Los argumentos obligatorios para las opciones largas también son obligatorios para las opciones cortas.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:396 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
" de ficheros de entrada\n"
"Si no se da ningún fichero de entrada o si es -, se lee la entrada estándar.\n"
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgfilter.c:375
-#: src/msggrep.c:404 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:517
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
"fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
"los ficheros PO se conservarán. \n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:533
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -s, --sort-output escribe la salida ordenada\n"
" -F, --sort-by-file escribe la salida ordenada por fichero\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:599
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -h, --help muestra esta ayuda y finaliza\n"
" -V, --version muestra la versión y finaliza\n"
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "no se especificaron ficheros de entrada"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "se requieren exactamente 2 ficheros de entrada"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
# y en otros de otra (la frase no era exactamente igual).
# 11061996mm: En particular en gettext el letrero es estándar, por lo que
# prefiero "también son" que, creo suena mejor. Homogeinizo todo.
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
"tal forma que la precisión del diagnóstico sea mejor.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORIO añade al DIRECTORIO a la lista de búsqueda\n"
" de ficheros de entrada\n"
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n"
" def.po\n"
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "este mensaje se usa pero no está definido..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...pero esta definición es parecida"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "este mensaje se usa pero no está definido en %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "atención: este mensaje no se utiliza"
#
# 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
# aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:339 src/po-lex.c:707
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[1] "se encontraron %d errores fatales"
# Nota: es la definición la que está duplicada.
-#: src/msgcmp.c:420 src/msgfmt.c:1346 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definición del mensaje duplicada"
-#: src/msgcmp.c:421 src/msgfmt.c:1347 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...aquí está la primera definición"
# Lo mismo en ' informa de la versión...' em
# Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende
# es ser fiel al original, pon 'son tambien obligatorios para...' em+
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, no-wrap
msgid ""
"Output details:\n"
" -F, --sort-by-file escribe la salida ordenada por fichero\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:401
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "no se especificó el fichero de entrada"
-#: src/msgen.c:192
+#: src/msgen.c:191
msgid "exactly one input file required"
msgstr "se requieren exactamente un ficheros de entrada"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"por xgettext). Las entradas no traducidas son asignadas a una traducción que\n"
"es idéntica a la del msgid y son marcadas como difusas.\n"
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"traducción, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
"utilizar como entrada para \"xargs -0\".\n"
-#: src/msgexec.c:253 src/msgfilter.c:367
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
msgid "write to stdout failed"
msgstr "fallo en la escritura a la salida estándar"
-#: src/msgexec.c:337 src/msgfilter.c:604
+#: src/msgexec.c:337 src/msgfilter.c:603
#, c-format
msgid "write to %s subprocess failed"
msgstr "fallo en la escritura la subproceso %s"
-#: src/msgfilter.c:264
+#: src/msgfilter.c:263
msgid "missing filter name"
msgstr "falta el nombre del filtro"
-#: src/msgfilter.c:288
+#: src/msgfilter.c:287
msgid "at least one sed script must be specified"
msgstr "se debe especificar al menos un guión de sed"
-#: src/msgfilter.c:352
+#: src/msgfilter.c:351
#, c-format, no-wrap
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
-#: src/msgfilter.c:357
+#: src/msgfilter.c:356
#, no-wrap
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
-#: src/msgfilter.c:383
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
"estándar y escriba una traducción modificada a la salida estándar.\n"
-#: src/msgfilter.c:389
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
# Lo mismo en ' informa de la versión...' em
# Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende
# es ser fiel al original, pon 'son tambien obligatorios para...' em+
-#: src/msgfilter.c:398
+#: src/msgfilter.c:397
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output escribe la salida ordenada\n"
" -F, --sort-by-file escribe la salida ordenada por fichero\n"
-#: src/msgfilter.c:556
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
-#: src/msgfilter.c:584
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr "fallo en la comunicación con el subproceso %s"
-#: src/msgfilter.c:635
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr "fallo en la lectura del subproceso %s"
-#: src/msgfilter.c:651
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "el subproceso %s terminó con un código de salida %d"
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "el argumento a %s debe ser un solo carácter de puntuación"
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s requiere que se especifique un \"-d directorio\""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr "%s sólo es válido con %s"
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaje traducido"
msgstr[1] "%d mensajes traducidos"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducción difusa"
msgstr[1] ", %d traducciones difusas"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaje sin traducir"
msgstr[1] ", %d mensajes sin traducir"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Genera un catálogo binario de mensajes a partir de la descripción de la traducción textual.\n"
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
" ficheros de entrada\n"
"Si el fichero de entrada es -, se lee la entrada estándar.\n"
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 como --java, y supone el uso de Java2\n"
" (JDK 1.2 o superior)\n"
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
" --strict habilita el modo estricto de Uniforum\n"
"Si el fichero de salida es -, se escribe en la salida estándar.\n"
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
"se escribe bajo el directorio especificado.\n"
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" teclado para los elementos del menú\n"
" -f, --use-fuzzy utiliza entradas difusas para la salida\n"
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" (por defecto es: %d)\n"
" --no-hash el fichero binario no incluirá la tabla de hash\n"
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" --statistics muestra las estadísticas sobre las traducciones\n"
" -v, --verbose aumenta el cantidad de mensajes\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr "la expresión plural puede producir resultados negativos"
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
"nplurals = %lu pero las expresiones plurales pueden producir valores tan "
"grades como %lu"
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr "la expresión plural puede producir una división por cero"
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr "la expresión plural puede producir un sobreflujo entero"
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
"la expresión plural puede producir excepciones aritméticas, posiblemente una "
"división por cero"
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
msgid "invalid nplurals value"
msgstr "valor inválido de nplurals"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr "expresión plural inválida"
-#: src/msgfmt.c:899 src/msgfmt.c:914
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr "nplurals = %lu ..."
-#: src/msgfmt.c:902
+#: src/msgfmt.c:915
#, fuzzy, c-format
msgid "...but some messages have only one plural form"
msgid_plural "...but some messages have only %lu plural forms"
msgstr[0] "... pero algunos mensajes sólo tienen %lu formas plurales"
msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
-#: src/msgfmt.c:917
+#: src/msgfmt.c:930
#, fuzzy, c-format
msgid "...but some messages have one plural form"
msgid_plural "...but some messages have %lu plural forms"
msgstr[0] "... pero algunos mensajes tienen %lu formas plurales"
msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
-#: src/msgfmt.c:934
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:972
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:982
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgfmt.c:994
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1011
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1021
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
# y la otra no, así de sencillo. sv+
-#: src/msgfmt.c:1033
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
-#: src/msgfmt.c:1045
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr "el manejo del plural es una extensión del gettext de GNU"
-#: src/msgfmt.c:1110
+#: src/msgfmt.c:1123
#, fuzzy, c-format
msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr "'msgstr' no es un formato de cadena válido %s, a diferencia de 'msgid'"
-#: src/msgfmt.c:1145
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
-#: src/msgfmt.c:1153
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "no existe el campo `%s' en la cabecera"
-#: src/msgfmt.c:1190
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "el campo `%s' debe comenzar al principio de la línea"
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "algunos campos de cabecera aún tienen el valor inicial"
-#: src/msgfmt.c:1210
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "el campo `%s' aún tiene el valor inicial"
-#: src/msgfmt.c:1251
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
-#: src/msgfmt.c:1254
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "atención: el encabezado del fichero PO está difuso\n"
-#: src/msgfmt.c:1266
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"atención: las versiones anteriores de msgfmt producirán un error en esto\n"
-#: src/msgfmt.c:1291
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
-#: src/msgfmt.c:1296
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
"se utilizará un prefijo"
-#: src/msgfmt.c:1307
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "la instrucción `domain %s' no tiene efecto"
# Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
# Sugerencia: Descartar. sv
# Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1379
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "se descarta la línea vacía `msgstr'"
# Lo mismo. sv
# Ok. mm
-#: src/msgfmt.c:1380
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "se descarta la línea difusa `msgstr'"
-#: src/msgfmt.c:1449
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
-#: src/msggrep.c:363
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
"la opción '%c' no se puede usar antes de que 'K' o 'T' hayan sido "
"especificadas"
-#: src/msggrep.c:385
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
"patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
-#: src/msggrep.c:412
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
# Lo mismo en ' informa de la versión...' em
# Obligatorios.. obligatorios , queda un poco feo. Si lo que se pretende
# es ser fiel al original, pon 'son tambien obligatorios para...' em+
-#: src/msggrep.c:440
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-by-file escribe la salida ordenada por localización \n"
" de fichero\n"
-#: src/msggrep.c:530
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "fallo en la escritura al subproceso grep"
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
"es necesario para que se puedan probar las traducciones.\n"
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"Favor de especificar el formato local a través de la opción --locale o\n"
"el fichero de salida .po a través de la opción --output-file.\n"
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr "Creado %s.\n"
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
"tomados del entorno del usuario.\n"
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"actual.\n"
"Si es -, se lee la entrada estándar.\n"
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"de la selección local del usuario. Si es -, los resultados se escriben en\n"
"la salida estándar.\n"
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" automáticamente\n"
" -w, --width=NÚMERO ajusta la anchura de la página de salida\n"
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr "error en la lectura del directorio actual"
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
-#: src/msginit.c:894 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr "fallo en fdopen()"
-#: src/msginit.c:899 src/msginit.c:951 src/msginit.c:1089
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr "error de E/S en el subproceso %s"
-#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "fallo en el subproceso %s con código de salida %d"
-#: src/msginit.c:1074
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1454
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr "Traducciones al español para el paquete %s"
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
"el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
"portátil"
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
"hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
"entrada"
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
"el fichero de entrada `%s' no contiene una línea de encabezado con la "
"especificación del conjunto de caracteres"
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
"encabezado con la especificación del conjunto de caracteres"
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
"portátil."
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr "atención: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
"Los ficheros de entrada contienen mensajes en distintas codificaciones,\n"
"UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n"
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"%s y %s entre otras.\n"
"Por ello se convierte la salida a UTF-8.\n"
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"La salida de '%s' podría ser incorrecta.\n"
"Las posibles alternativas son:\n"
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr "- Poner LC_ALL como local con la codificación %s.\n"
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"La salida de '%s' podría ser incorrecta.\n"
"Una alternativa posible s poner LC_ALL=C.\n"
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "falla de conversión"
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
"El fichero de entrada no contiene una línea de encabezado que especifique el "
"conjunto de caracteres"
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
"no soporta este tipo de conversión."
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
"Esta versión fue construida sin iconv()."
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr "tipo de respaldo"
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
"para obtener mejores resultados.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" -C, --compendium=FICHERO biblioteca adicional de traducción de mensajes,\n"
" puede ser especificada más de una vez\n"
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" -U, --update actualiza def.po,\n"
" no hace nada si def.po ya está actualizado\n"
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"El sufijo de los respaldos es `~', a menos que se ponga la opción --suffix o\n"
"la variable de entorno SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose incrementa el nivel de mensajes\n"
" -q, --quiet, --silent suprime los indicadores de progreso\n"
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
msgid "this message should define plural forms"
msgstr "este mensaje debería definir las formas plurales"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
msgid "this message should not define plural forms"
msgstr "este mensaje no debería definir las formas plurales"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
# Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " terminado.\n"
"puede especificar otro lugar.\n"
"Directorio de búsqueda estándar: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: atención: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"La conversión de mensajes al conjunto de caracteres del usuario podría no "
"funcionar.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Se continúa de todas formas."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
"e iconv() no soporta \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Instalando GNU libiconv y luego reinstalando GNU gettext\n"
"podría arreglar este problema.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
"Esta versión fue construida sin iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"La conversión de mensajes al conjunto de caracteres del usuario no "
"funcionará.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "no hay sección `msgstr'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "no hay sección `msgstr'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "no hay sección `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "la primera forma del plural tiene un índice distinto a cero"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "la primera forma del plural tiene un índice incorrecto"
msgid "too many errors, aborting"
msgstr "demasiados errores, programa interrumpido"
-#: src/po-lex.c:547 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "sucesión de multibyte inválida"
msgid "iconv failure"
msgstr "fallo en iconv"
-#: src/po-lex.c:765 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:287
-#: src/x-librep.c:170 src/x-lisp.c:236 src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "error al leer \"%s\""
-#: src/po-lex.c:831
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palabra clave \"%s\" desconocida"
-#: src/po-lex.c:941
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "secuencia de control ilegal"
-#: src/po-lex.c:1049
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "fin de fichero dentro de una cadena"
-#: src/po-lex.c:1055
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "fin de línea dentro de una cadena"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "el fichero \"%s\" está truncado"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "fallo en la lectura \"%s\" en la posición (offset) %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
msgid "error writing stdout"
msgstr "error al escribir \"%s\""
-#: src/write-java.c:1108
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr "no es un nombre de clase Java válido: %s"
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr "fallo al crear \"%s\""
-#: src/write-java.c:1209 src/write-mo.c:294 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "hubo un error al escribir el fichero \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
-#: src/write-mo.c:282
+#: src/write-mo.c:277
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error al abrir el fichero \"%s\" para escritura"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
"Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
"%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
"en ASCII puro. %s\n"
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "no se puede crear el fichero de salida \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "salida estándar"
-#: src/x-c.c:936
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
-#: src/x-c.c:960
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: atención: literal de cadena no finalizada"
# mente el verbo poder en Castellano es mucho más flexible que en otros
# idiomas. De todas maneras siempre se puede mirar otras traducciones. em
# ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/x-po.c:106 src/xgettext.c:619
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "este fichero no puede contener instrucciones de dominio"
msgid "%s:%d: invalid string expression"
msgstr "%s:%d: expresión de cadena inválida"
-#: src/xgettext.c:388
+#: src/xgettext.c:384
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:393
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext no puede funcionar sin palabras claves que buscar"
-#: src/xgettext.c:481
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"atención: el fichero `%s' con extensión `%s'\n"
"es desconocido; se intentará tipo C"
-#: src/xgettext.c:522
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
-#: src/xgettext.c:527
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Los argumentos obligatorios en las opciones largas también lo son para las \n"
"opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
-#: src/xgettext.c:542
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
" directorio DIR\n"
"Si el fichero de salida es -, la salida será escrita a la salida estándar.\n"
-#: src/xgettext.c:551
-#, no-wrap
+#: src/xgettext.c:547
+#, fuzzy, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
"Por defecto, el lenguaje se adivina dependiendo de la extensión del fichero\n"
"de entrada.\n"
-#: src/xgettext.c:560
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" aquellas líneas que preceden a la palabra\n"
" clave) en el fichero de salida\n"
-#: src/xgettext.c:569
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug muestra con más detalle el reconocimiento\n"
" de las cadenas de formato\n"
-#: src/xgettext.c:579
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -M, --msgstr-suffix[=CADENA] utiliza la CADENA o \"\" como sufijo para las\n"
" líneas del msgstr\n"
-#: src/xgettext.c:799
+#: src/xgettext.c:796
msgid "standard input"
msgstr "entrada estándar"
-#: src/xgettext.c:914
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"gettext(\"\") regresa la línea de encabezado con la\n"
"metainformación, no una cadena vacía.\n"
-#: src/xgettext.c:1211
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "lenguaje `%s' desconocido"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-04-30 16:25+0200\n"
"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "viga faili \"%s\" avamisel (lugemiseks)"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "viga \"%s\" lugemisel"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "viga faili \"%s\" kirjutamisel"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "viga \"%s\" lugemisel"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Tundmatu süsteemne viga"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "mälu sai otsa"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "ei suuda luua väljundfaili \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku\n"
"Litsentsi.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Selle programmi on kirjutanud %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "liiga palju argumente"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "argumendid on puudu"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" määratud piirkonnas ja omavad identifikaatorit\n"
" STRID\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"found in the selected catalog are translated.!!!\n"
"Standardne otsinukataloog: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ja %s on vastastikku välistavad"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
"Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n"
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "sisendfailid on määramata"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "vaja läheb täpselt kahte sisendfaili"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"teated on tõlgitud. Kui täpseid vasteid ei suudeta leida, kasutatakse parema\n"
"diagnoosi huvides määratlust 'kahtlane'.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "see teade on kasutusel, kuid kirjeldamata..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...kuid see kirjeldus on sarnane"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "hoiatus: see teade on kasutamata"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "leitud %d tõsine viga"
msgstr[1] "leitud %d tõsist viga"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "teade on kirjeldatud kaks korda"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...see on esimese kirjelduse asukoht"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n"
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "sisendfail on määramata"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "vaja läheb täpselt kahte sisendfaili"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "argumendid on puudu"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "vähemalt kaks faili peab olema ette antud"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "argumendid on puudu"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "vähemalt kaks faili peab olema ette antud"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n"
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d tõlgitud teade"
msgstr[1] "%d tõlgitud teadet"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d kahtlane tõlge"
msgstr[1] ", %d kahtlast tõlget"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d tõlkimata teade"
msgstr[1] ", %d tõlkimata teadet"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "vigane juhtjada"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
+msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
+msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "päise kirjest on puudu väli `%s'"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "päise kirjes peab väli `%s' algama rea algusest"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "väli `%s' sisaldab ikka veel algset väärtust"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"Kooditabel on päises kirjeldamata.\n"
"Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ignoreerin `domain %s' direktiivi"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "ignoreerin tühja `msgstr' kirjet"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ignoreerin kahtlast `msgstr' kirjet"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n"
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: hoiatus: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt ja iconv() ei toeta \"%s\".\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"kahtlased. Kui väljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
"standardväljunisse.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %"
"ld, vananenuid %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " valmis.\n"
"lugeda keskkonnamuutujast TEXTDOMAINDIR.\n"
"Standardne otsinukataloog: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: hoiatus: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Kooditabel \"%s\" ei ole portaabel kodeerimise nimetus.\n"
"Teadete tõlkimine kasutaja kooditabeli järgi võib mitte toimida.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Jätkan siiski, vaatamate parsimisvigadele."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Jätkan siiski."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt ja iconv() ei toeta \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
"GNU gettext\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"Kooditabel on päises kirjeldamata.\n"
"Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "vastuoluline #~ kasutamine"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "puudub `msgstr[]' sektsioon"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "puudub `msgid_plural' sektsioon"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "puudub `msgstr' sektsioon"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "esimene mitmuse vormi indeks erineb nullist"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "mitmuse vorm omab vale indeksit"
msgid "too many errors, aborting"
msgstr "liiga palju vigu, katkestan töö"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "vigane multibait jada"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "vigane multibait jada"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "vigane multibait jada"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "viga \"%s\" lugemisel"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "tundmatu võtmesõna: \"%s\""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "vigane juhtjada"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "Ootamatu faili lõpp (fail lõppeb poole stringi pealt)"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "reavahetus asub stringi sees"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "faili \"%s\" sai kärbitud"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "hüpe \"%s\" positsioonile %ld ebaõnnestus"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "fail \"%s\" ei ole GNU .mo vormingus"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "liiga palju argumente"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "viga faili \"%s\" kirjutamisel"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "ei suuda luua väljundfaili \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "viga faili \"%s\" kirjutamisel"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "ei suuda luua väljundfaili \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standardväljund"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: lõpetamata sümbolkonstant"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: hoiatus: lõpetamata string"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "see fail ei tohi sisaldada domeeni direktiive"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse "
"standardväljundisse"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version väljastab versiooniinfo ja lõpetab programmi töö\n"
" -w, --width=NUMBER määrab väljastatava lehekülje laiuse\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standardsisend"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "tundmatu keel `%s'"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
+
#~ msgid "while creating hash table"
#~ msgstr "paisktabeli loomise käigus"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-14 08:00-05:00\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: lib/argmatch.c:134
msgid "error after reading \"%s\""
msgstr "erreur après la lecture de « %s »"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Erreur système non identifiée"
msgstr ""
"nombre de spécifications de format entre «msgid» et «%s» ne concorde pas"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
"spécifications de format entre «msgid» et «%s» de l'argument %u ne sont pas "
"identiques"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"spécification de format de l'argument «%u», comme dans «%s», n'existe pas "
+"dans «msgid»"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "spécification de format de l'argument %u n'existe pas dans «%s»"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"spécification de format de l'argument {%u}, comme dans «%s», n'existe pas "
"dans «msgid»"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "spécification de format de l'argument {%u} n'existe pas dans «%s»"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"spécifications de format de «msgid» et de «%s» de l'argument «%s» ne sont "
"pas les mêmes"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "spécification de format de l'argument %u n'existe pas dans «%s»"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"spécification de format de l'argument «%u», comme dans «%s», n'existe pas "
-"dans «msgid»"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address addresses IP de la machine hôte\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "ne peut obtenir le nom de l'hôte"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "au plus un fichier d'entrée est permis"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s et %s s'excluent mutuellement"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
"Les arguments obligatoires pour la forme longue des options sont aussi\n"
"obligatoires pour les formes courtes qui leur correspondent.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[0] "%d erreur fatale trouvée"
msgstr[1] "%d erreurs fatales trouvées"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "message doublement défini"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...voici l'endroit de la première définition"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "« msgstr » a trop de raccourcis clavier pour la marque '%c'"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Le champ « %s » est absent de l'en-tête"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Le champ « %s » devrait s'appuyer au début de la ligne"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "Quelques champs de l'en-tête ont toujours leur valeur initiale"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "Le champ « %s » a toujours sa valeur initiale"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "AVERTISSEMENT: l'en-tête du fichier PO est manquante ou invalide\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "AVERTISSEMENT: le conversion du charset ne fonctionnera pas\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "AVERTISSEMENT: l'en-tête du fichier PO est floue\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"AVERTISSEMENT: les vieilles versions de msgfmt donneront une erreur là "
"dessus\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "« %s » n'est pas approprié comme nom de domaine"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "la directive « domain %s » sera ignorée"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "chaîne « msgstr » vide, entrée ignorée"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "chaîne « msgstr » floue, entrée ignorée"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
"l'option '%c' ne peut être utilisée avant que 'K' ou 'T' n'ai été spécifié"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extraire tous les messages du catalogue de traduction qui concordent avec\n"
"un patron particulier ou qui appartiennent à un fichier source donné.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FICHIER obtenir le patron à partir du FICHIER\n"
" -i, --ignore-case ignorer la distinction liée à la casse\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output générer une sortie triée\n"
" --sort-by-file trier la sortie selon la localisation des fichiers\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "écriture vers le sous-processus de grep a échoué"
msgid "English translations for %s package"
msgstr "Traduction anglaise du package %s"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "le présent charset « %s » n'a pas un nom d'encodage portable"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "deux charsets différents « %s » et « %s » dans le fichier d'entrée"
"Le domaine « %s » dans le fichier d'entrée `%s' ne contient pas d'en-tête "
"avec la spécification d'un charset"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable."
"La sortie de « %s » pourrait être incorrecte.\n"
"Un ajustement nécessaire possible est de définir LC_ALL=C.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "échec de conversion"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
"Le fichier d'entrée ne contient pas d'en-tête avec la spécification d'un "
"charset"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui ne "
"supporte pas cette conversion."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"répertoire.\n"
"Répertoire standard de recherche: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
msgid "iconv failure"
msgstr "échec de iconv()"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "erreur lors de la lecture de « %s »"
msgid "standard output"
msgstr "sortie standard"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: attention: constante caractère sans terminateur"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: attention: constante chaîne sans terminateur"
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\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"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr ""
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr ""
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, c-format
msgid "error reading \"%s\""
msgstr ""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, c-format
msgid "error writing \"%s\""
msgstr ""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, c-format
msgid "error after reading \"%s\""
msgstr ""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr ""
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr ""
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
msgid "cannot create pipe"
msgstr ""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr ""
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr ""
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr ""
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-#: src/format-lisp.c:3371
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-java.c:675
+#, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr ""
-#: src/format-python.c:391
+#: src/format-java.c:700
+#, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
msgstr ""
-#: src/format-python.c:399
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr ""
-#: src/format-python.c:432
+#: src/format-python.c:397
#, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
-#: src/format-python.c:446
+#: src/format-python.c:409
#, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
msgstr ""
-#: src/format-ycp.c:137
+#: src/format-python.c:437
#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr ""
-#: src/format-ycp.c:138
+#: src/format-python.c:452
#, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr ""
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/format-python.c:478
+#, c-format
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+msgstr ""
+
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr ""
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr ""
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" to MSGID from TEXTDOMAIN\n"
msgstr ""
-#: src/gettext.c:277
+#: src/gettext.c:266
#, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"Standard search directory: %s\n"
msgstr ""
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr ""
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr ""
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr ""
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr ""
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr ""
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr ""
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr ""
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] ""
msgstr[1] ""
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr ""
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, no-wrap
msgid ""
"Output details:\n"
" -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr ""
-#: src/msgen.c:192
+#: src/msgen.c:191
msgid "exactly one input file required"
msgstr ""
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
-msgid "missing filter name"
+#: src/msgexec.c:180
+msgid "missing command name"
msgstr ""
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
+#: src/msgexec.c:228
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:343
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#: src/msgexec.c:233
+#, no-wrap
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:242
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+msgid "missing filter name"
+msgstr ""
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr ""
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
msgid "invalid nplurals value"
msgstr ""
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] ""
+msgstr[1] ""
#: src/msgfmt.c:930
+#, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr ""
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr ""
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr ""
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr ""
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
msgid "this message should define plural forms"
msgstr ""
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
msgid "this message should not define plural forms"
msgstr ""
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
msgstr ""
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr ""
"Standard search directory: %s\n"
msgstr ""
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr ""
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr ""
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr ""
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr ""
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr ""
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr ""
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr ""
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr ""
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr ""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr ""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr ""
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr ""
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr ""
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr ""
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr ""
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr ""
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr ""
-#: src/write-java.c:1108
+#: src/urlget.c:150
+msgid "expected two arguments"
+msgstr ""
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+msgid "error writing stdout"
+msgstr ""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr ""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr ""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr ""
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr ""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr ""
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr ""
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
msgstr ""
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr ""
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.10.39\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-07-28 17:00+0200\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1)\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro ao abrir \"%s\" para lectura"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "erro ao abrir \"%s\" para escribir"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "erro ao escribi-lo ficheiro \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Erro de sistema descoñecido"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "memoria esgotada"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
"o número de especificacións de formato en `msgid' e `msgstr' non coincide"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
+#: src/format-java.c:700
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
"o número de especificacións de formato en `msgid' e `msgstr' non coincide"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-lisp.c:3402
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
+#: src/format-python.c:397
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
"o número de especificacións de formato en `msgid' e `msgstr' non coincide"
-#: src/format-python.c:399
-#, fuzzy
+#: src/format-python.c:409
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
"mapping"
msgstr ""
"o número de especificacións de formato en `msgid' e `msgstr' non coincide"
-#: src/format-python.c:422
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
-msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-
-#: src/format-python.c:432
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "as especificacións de formato do argumento %lu non son as mesmas"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"ningunha garantía; nin sequera de COMERCIABILIDADE ou IDONEIDADE PARA UN\n"
"FIN DETERMINADO.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "faltan argumentos"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Use `%s --help' para máis información.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [DOMINIO] MSGID obte-la mensaxe traducida correspondente a\n"
" MSGID do DOMINIO\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"que atopa no catálogo escollido.\n"
"Directorio estándar de busca: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s son mutuamente excluíntes"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
"ficheiro para definilos. Mantéñense as posicións de tódolos ficheiros PO.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version amosa-la información da versión e saír\n"
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "non se indicou ningún ficheiro de entrada"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "precísanse exactamente dous ficheiros de entrada"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"un emparellamento exacto, úsase coincidencia difusa, de xeito que se produza\n"
"un mellor diagnóstico.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "esta mensaxe úsase mais non está definida..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...mais esta definición é semellante"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensaxe úsase mais non está definida en %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "aviso: esta mensaxe non se usa"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "atopouse %d erro grave"
msgstr[1] "atopáronse %d erros graves"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definición de mensaxe duplicada"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...este é o lugar da primeira definición"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version amosa-la información da versión e saír\n"
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "non se indicou ningún ficheiro de entrada"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "precísanse exactamente dous ficheiros de entrada"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "faltan argumentos"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "téñense que indicar polo menos dous ficheiros"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "faltan argumentos"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "téñense que indicar polo menos dous ficheiros"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version amosa-la información da versión e saír\n"
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaxe traducida"
msgstr[1] "%d mensaxes traducidas"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducción difusa"
msgstr[1] ", %d traduccións difusas"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaxe sen traducir"
msgstr[1] ", %d mensaxes sen traducir"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "secuencia de control ilegal"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "esta mensaxe úsase mais non está definida en %s"
+msgstr[1] "esta mensaxe úsase mais non está definida en %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "esta mensaxe úsase mais non está definida en %s"
+msgstr[1] "esta mensaxe úsase mais non está definida en %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "falta o campo `%s' na cabeceira"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "o campo `%s' aínda ten o valor inicial por defecto"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
"%*s aviso: a conversión de código de caracteres non vai funcionar"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"Falta o código de caracteres na cabeceira.\n"
"A conversión da mensaxe ao código do usuario non vai funcionar.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
"%*s aviso: a conversión de código de caracteres non vai funcionar"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n"
"empregarase un prefixo"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "directiva `domain %s' ignorada"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "entrada `msgstr' baleira ignorada"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "entrada `msgstr' difusa ignorada"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version amosa-la información da versión e saír\n"
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: aviso: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"O código de caracteres \"%s\" non está soportado. %s depende de\n"
"iconv(), e iconv() non soporta \"%s\".\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
"Esta versión foi compilada sen iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
# src/msgmerge.c:324
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"para producir mellores resultados. Os resultados escríbense na saída\n"
"estándar a menos que se indique un ficheiro de saída.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "esta mensaxe úsase mais non está definida en %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "esta mensaxe úsase mais non está definida en %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %"
"ld, obsoletas %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " rematado.\n"
"pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
"Directorio estándar de busca: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: aviso: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"O código de caracteres \"%s\" non ten un nome portable.\n"
"A conversión da mensaxe ao código do usuario podería non funcionar.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Continuando de calquera xeito, espere atopar erros de análise."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Continuando de calquera xeito."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"O código de caracteres \"%s\" non está soportado. %s depende de\n"
"iconv(), e iconv() non soporta \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Se instala GNU libiconv e logo reinstala o GNU gettext\n"
"podería arranxarse o problema.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
"Esta versión foi compilada sen iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"Falta o código de caracteres na cabeceira.\n"
"A conversión da mensaxe ao código do usuario non vai funcionar.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "falta a sección `msgstr[]'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "falta a sección `msgid_plural'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "falta a sección `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "a primera forma do plural ten un índice distinto a cero"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "a forma do plural ten un índice erróneo"
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "secuencia multibyte non válida"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "secuencia multibyte non válida"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "secuencia multibyte non válida"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palabra chave \"%s\" descoñecida"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "secuencia de control ilegal"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "fin de ficheiro nunha cadea"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "fin de liña nunha cadea"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "ficheiro \"%s\" truncado"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "fallo ao desprazarse á posición %2$ld de \"%1$s\""
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "o ficheiro \"%s\" contén unha cadea non rematada en NUL"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "o ficheiro \"%s\" non está no formato .mo de GNU"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "demasiados argumentos"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "erro ao escribi-lo ficheiro \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro ao escribi-lo ficheiro \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "erro ao abrir \"%s\" para escribir"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "non se pode crea-lo ficheiro de saída \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "saída estándar"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: aviso: literal de cadea non rematada"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "este ficheiro non pode conter directivas de dominio"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "non se pode usar --join-existing cando a saída se escribe en stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext non funciona sen palabras chave polas que buscar"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version amosa-la información da versión e saír\n"
" -w, --width=NÚMERO establece-la anchura da páxina de saída\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "entrada estándar"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "linguaxe `%s' descoñecida"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "as especificacións de formato do argumento %lu non son as mesmas"
+
#~ msgid "while creating hash table"
#~ msgstr "ao crea-la táboa `hash'"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 1999-09-19 10:24+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesian <id@li.org>\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "kesalahan saat membuka \"%s\" untuk dibaca"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "kesalahan ketika membaca \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "kesalahan saat menulis file \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "kesalahan ketika membaca \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Kesalahan sistem tak dikenal"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
#, fuzzy
msgid "memory exhausted"
msgstr "Memori habis"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "tidak dapat membuat file output \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "spesifikasi format untuk argumen %u tidak sama"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "jumlah spesifikasi format dalam `msgid' dan `msgstr' tidak sesuai"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "spesifikasi format untuk argumen %u tidak sama"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "spesifikasi format untuk argumen %u tidak sama"
# )
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"Ini adalah free software; lihat source untuk kondisi penyalinan. Tidak ada\n"
"jaminan; bahkan untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Ditulis oleh %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "terlalu banyak argumen"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "Argumen hilang"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID mengambil pesan terjemahan yang sesuai\n"
" untuk MSGID dari TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"diterjemahkan.\n"
"Direktori pencarian standar: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s dan %s adalah mutually exclusive"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "digunakan kriteria pemilihan yang tidak mungkin (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
"mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version tampilkan informasi versi dan keluar\n"
" -w, --width=NUMBER set lebar halaman output\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "tidak diberikan file input"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "dibutuhkan tepat 2 file input"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"program anda. Bilamana tidak ditemukan kecocokan yang tepat, digunakan fuzzy\n"
"matching untuk menghasilkan diagnostik yang lebih baik.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "pesan ini digunakan tapi tidak didefinisikan..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...tetapi definisi ini serupa"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "peringatan: pesan ini tidak digunakan"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "ditemukan %d kesalahan fatal"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definisi pesan ganda"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...ini adalah lokasi definisi pertama"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version tampilkan informasi versi dan keluar\n"
" -w, --width=NUMBER set lebar halaman output\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "tidak diberikan file input"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "dibutuhkan tepat 2 file input"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "Argumen hilang"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "paling tidak dua file harus dispesifikasikan"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "Argumen hilang"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "paling tidak dua file harus dispesifikasikan"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version tampilkan informasi versi dan keluar\n"
" -w, --width=NUMBER set lebar halaman output\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d pesan diterjemahkan"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d terjemahan fuzzy"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d pesan belum diterjemahkan"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "urutan kendali ilegal"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
+msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
+msgstr[1] "pesan ini digunakan tapi tidak didefinisikan dalam %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak dimulai dengan '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "masukan `msgid' dan `msgstr' tidak diakhiri dengan '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "headerfield `%s' tidak ada dalam header"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "header field `%s' harus dimulai di awal baris"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "beberapa field header masih memiliki nilai baku awal"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "field `%s' masih memiliki nilai baku awal"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nama domain \"%s\" tidak sesuai dengan nama file"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktiv `domain %s' diabaikan"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "masukan `msgstr' kosong diabaikan"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "masukan fuzzy `msgstr' diabaikan"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version tampilkan informasi versi dan keluar\n"
" -w, --width=NUMBER set lebar halaman output\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
"ke stdout kecuali diberikan sebuah output file.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sMembaca %d lama + %d referensi, digabung %d, fuzzy %d, hilang %d, kuno %"
"d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " selesai.\n"
"diterjemahkan.\n"
"Direktori pencarian standar: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr ""
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "bagian `msgstr' hilang"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "bagian `msgstr' hilang"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "bagian `msgstr' hilang"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "terlalu banyak kesalahan, dibatalkan"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr ""
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr ""
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr ""
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "kesalahan ketika membaca \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "kata kunci \"%s\" tidak dikenal"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
#, fuzzy
msgid "invalid control sequence"
msgstr "urutan kendali ilegal"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "end-of-file dalam string"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "end-of-line dalam string"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "file \"%s\" terpotong"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "gagal mencari \"%s\" offset %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "file \"%s\" bukan dalam format GNU .mo"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "file \"%s\" bukan dalam format GNU .mo"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "terlalu banyak argumen"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "kesalahan saat menulis file \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "tidak dapat membuat file output \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "kesalahan saat menulis file \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "kesalahan ketika membuka \"%s\" untuk ditulis"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "tidak dapat membuat file output \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standard output"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "file ini tidak boleh mengandung direktiv domain"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "peringatan: file `%s' ekstensi `%s' tidak dikenal; dicoba C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version tampilkan informasi versi dan keluar\n"
" -w, --width=NUMBER set lebar halaman output\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "bahasa `%s' tidak dikenal"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "spesifikasi format untuk argumen %u tidak sama"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "spesifikasi format untuk argumen %u tidak sama"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "spesifikasi format untuk argumen %u tidak sama"
+
#~ msgid "while creating hash table"
#~ msgstr "sementara membuat tabel hash"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2000-02-17 15:30+01:00\n"
"Last-Translator: Giovanni Bortolozzo <borto@pluto.linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "errore durante l'apertura in lettura di \"%s\""
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "errore durante l'apertura in scrittura di \"%s\""
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "errore durante la lettura di \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "errore durante la scrittura del file \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "errore durante la lettura di \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Errore di sistema sconosciuto"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
#, fuzzy
msgid "memory exhausted"
msgstr "Memoria esaurita"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "impossibile creare il file d'uscita \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
"il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
+#: src/format-java.c:700
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
"il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-lisp.c:3402
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
+#: src/format-python.c:397
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
"il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono"
-#: src/format-python.c:399
-#, fuzzy
+#: src/format-python.c:409
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
"mapping"
msgstr ""
"il numero di specifiche di formato in `msgid' e `msgstr' non corrispondono"
-#: src/format-python.c:422
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
-msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-
-#: src/format-python.c:432
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"NON c'è nessuna garanzia; neppure di COMMERCIABILITÀ o di IDONEITÀ AD UN\n"
"PARTICOLARE SCOPO.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Scritto da %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "troppi argomenti"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "mancano degli argomenti"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare `%s --help' per ulteriori informazioni.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [DOMINIOTESTO] MSGID recupera da DOMINIOTESTO i messaggi tradotti\n"
" corrispondenti a MSGID\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"catalogo selezionato.\n"
"Directory di ricerca standard: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Segnalare i bug a <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s sono mutuamente esclusive"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"solamente dal primo file PO che li definisce. Saranno conservate le posizioni\n"
"nei file di tutti i file PO.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version mostra informazioni sulla versione ed esce\n"
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "non sono specificati file d'ingresso"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "sono richiesti esattamente 2 file d'ingresso"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"non è possibile trovare una corrispondenza esatta, sono usate le\n"
"corrispondenze approssimative (fuzzy) per produrre diagnostiche migliori.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "questo messaggio è usato ma non definito..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...ma questa definizione è simile"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "questo messaggio è usato ma non è definito in %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "attenzione: questo messaggio non è usato"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "trovati %d errori fatali"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definizione del messaggio duplicata"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...questa è la posizione della prima definizione"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version mostra informazioni sulla versione ed esce\n"
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "non è specificato nessun file d'ingresso"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "sono richiesti esattamente 2 file d'ingresso"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "mancano degli argomenti"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "devono essere specificati almeno due file"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "mancano degli argomenti"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "devono essere specificati almeno due file"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version mostra informazioni sulla versione ed esce\n"
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d messaggi tradotti"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traduzioni approssimative"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d messaggi non tradotti"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "sequenza di controllo illegale"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "questo messaggio è usato ma non è definito in %s"
+msgstr[1] "questo messaggio è usato ma non è definito in %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "questo messaggio è usato ma non è definito in %s"
+msgstr[1] "questo messaggio è usato ma non è definito in %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "le voci `msgid' e `msgstr' non cominciano entrambe con `\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "le voci `msgid' e `msgstr' non finiscono entrambe con `\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "nell'intestazione manca il campo `%s'"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr ""
"il campo `%s' dell'intestazione dovrebbe cominciare all'inizio della riga"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
"alcuni campi dell'intestazione sono ancora al valore iniziale predefinito"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "il campo `%s' ha ancora il valore iniziale predefinito"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
"un prefisso"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' direttiva ignorata"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "ignorata la voce `msgstr' vuota"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ignorata la voce `msgstr' approssimativa"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: attenzione: il file sorgente contiene traduzioni approssimative"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version mostra informazioni sulla versione ed esce\n"
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"approssimativa (fuzzy) per ottenere risultati migliori. I risultati sono\n"
"scritti su stdout a meno che non sia specificato un file d'uscita.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "questo messaggio è usato ma non è definito in %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "questo messaggio è usato ma non è definito in %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLetti %d vecchi + %d riferimenti, fusi %d, fuzzy %d, persi %d, obsoleti %"
"d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " fatto.\n"
"catalogo selezionato.\n"
"Directory di ricerca standard: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr ""
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "manca la sezione `msgstr'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "manca la sezione `msgstr'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "manca la sezione `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "troppi errori, annullato"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr ""
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr ""
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr ""
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "errore durante la lettura di \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "la parola chiave \"%s\" è sconoscita"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
#, fuzzy
msgid "invalid control sequence"
msgstr "sequenza di controllo illegale"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "end-of-file all'interno di una stringa"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "end-of-line all'interno di una stringa"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "file \"%s\" troncato"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "fallita ricerca di \"%s\" con offset %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "il file \"%s\" non è nel formato GNU .mo"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "il file \"%s\" non è nel formato GNU .mo"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "troppi argomenti"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "errore durante la scrittura del file \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "impossibile creare il file d'uscita \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "errore durante la scrittura del file \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "errore durante l'apertura in scrittura di \"%s\""
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
"i messaggi internazionalizzati non devono contenere la sequenza di escape `\\"
"%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "impossibile creare il file d'uscita \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standard output"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: attenzione: costante carattere non terminata"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: attenzione: letterale stringa non terminato"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "questo file potrebbe non contenere direttive di dominio"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing non può essere usato quando l'output è scritto su stdout"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "attenzione: il file `%s' ha estensione `%s' sconosciuta: proverò con C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version mostra informazioni sulla versione ed esce\n"
" -w, --width=NUMERO imposta la larghezza della pagina d'uscita\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "linguaggio `%s' sconosciuto"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "le specifiche di formato per l'argomento %u non sono le stesse"
+
#~ msgid "while creating hash table"
#~ msgstr "durante la creazione della tabella hash"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-12-11 13:41+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 1999-09-24 23:45+09:00\n"
"Last-Translator: JUN SAWATAISHI <jsawa@attglobal.net>\n"
"Language-Team: \n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:797 src/xgettext.c:810 src/xgettext.c:820
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "\"%s\" ¤Î¥ª¡¼¥×¥ó¤Ç¥¨¥é¡¼"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "\"%s\" ¤Î¥ª¡¼¥×¥ó¤Ç¥¨¥é¡¼"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr " \"%s\" ¤òÆɤ߹þ¤àºÝ¤Ë¥¨¥é¡¼"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Î½ñ¤¹þ¤ß¥¨¥é¡¼"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr " \"%s\" ¤òÆɤ߹þ¤àºÝ¤Ë¥¨¥é¡¼"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "ǧ¼±¤µ¤ì¤Ê¤¤¥·¥¹¥Æ¥à¥¨¥é¡¼"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:169 lib/pipe-in.c:205 lib/pipe-out.c:169 lib/pipe-out.c:205
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ¥ª¥×¥·¥ç¥ó -W %s ¤Ï°ú¿ô¤ò¤È¤ê¤Þ¤»¤ó\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "¥á¥â¥ê¡¼¤¬¸Ï³é¤·¤Þ¤·¤¿"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\"¤òºîÀ®¤Ç¤¤Ê¤¤"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:582 src/format-python.c:482
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
-#: src/format-c.c:595 src/format-python.c:495
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-java.c:656 src/format-pascal.c:400
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-java.c:669 src/format-pascal.c:413
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-java.c:686 src/format-pascal.c:430
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-lisp.c:3375
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-python.c:395
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-python.c:406
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
-#: src/format-python.c:432
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-python.c:445
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
-#: src/format-python.c:462
+#: src/format-python.c:409
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "`msgid'¤È`msgstr'¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬¹çÃפ·¤Þ¤»¤ó"
+
+#: src/format-python.c:437
+#, fuzzy, c-format
+msgid ""
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-ycp.c:141
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/format-ycp.c:142
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:165 src/msgfilter.c:244 src/msgfmt.c:333 src/msggrep.c:276
-#: src/msginit.c:247 src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207
-#: src/ngettext.c:126 src/xgettext.c:355
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥¨¥¢¤Ç¤¹¡£¥³¥Ô¡¼¤Î¾ò·ï¤Ë¤Ä¤¤¤Æ¤Ï¥½¡¼¥¹¤ò»²¾È¤Î¤³¤È\n"
"¤³¤Î¥½¥Õ¥È¥¦¥¨¥¢¤Ë¤ÏÁ´¤¯Êݾڤ¬¤¢¤ê¤Þ¤»¤ó.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:170 src/msgfilter.c:249 src/msgfmt.c:338 src/msggrep.c:281
-#: src/msginit.c:252 src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212
-#: src/ngettext.c:131 src/xgettext.c:360
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "%s ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡£\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "°ú¿ô¤¬·çÇ¡"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:223 src/msgfilter.c:342 src/msgfmt.c:479 src/msggrep.c:371
-#: src/msginit.c:338 src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269
-#: src/ngettext.c:210 src/xgettext.c:502
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "%s --help ¤Ç¤è¤ê¿¤¯¤Î¾ðÊó¤¬É½¼¨¤µ¤ì¤Þ¤¹\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID MSGID ¤Ë¼¨¤µ¤ì¤ëËÝÌõ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò\n"
" TEXTDOMAIN ¤«¤éÆÀ¤ë\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"¥á¥Ã¥»¡¼¥¸¤ÏËÝÌõ¤µ¤ì¤Æ¤¤¤ë\n"
"¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:267 src/msgfilter.c:415 src/msgfmt.c:563 src/msggrep.c:457
-#: src/msginit.c:389 src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343
-#: src/ngettext.c:244 src/xgettext.c:594
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-gnu-utils@gnu.org> ¤Þ¤Ç.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:261 src/msgfilter.c:409 src/msggrep.c:451
-#: src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:194
-#: src/msggrep.c:296 src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgfilter.c:264 src/msgfilter.c:268
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:370 src/xgettext.c:374
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ¤È %s ¤Ï¸ß¤¤¤ËÇÓ¾Ū¤Ç¤¹"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:248 src/msgfilter.c:357
-#: src/msgfmt.c:494 src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgfilter.c:370
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "ÁªÂò´ð½à¤¬ÉÔÀµ¤Ç¤¹ (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:507
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"½ÐÎϤµ¤ì¤ë¤è¤¦¤ËÀßÄê¤Ç¤¤Þ¤¹¡£(Îã: --less-than=2 ¤Ç¥æ¥Ë¡¼¥¯¤Ê¥á¥Ã¥»¡¼\n"
"¥¸¤Î¤ß¤ò½ÐÎϤ·¤Þ¤¹)\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:523
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version ¥ô¥¡¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
" -w, --width=NUMBER ¥Ú¡¼¥¸Éý¤ÎÀßÄê\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:588
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬Í×"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"ÍÍѤǤ¹¡£Àµ³Î¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¤Ï¤¢¤¤¤Þ¤¤¤Ê°ìÃ×Ë¡¤¬ÍѤ¤¤é¤ì¤Æ¡¢¤è¤ê\n"
"¾Ü¤·¤¤¿ÇÃÇ·ë²Ì¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ÄêµÁ¤µ¤ì¤Þ¤»¤ó..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...¤³¤ÎÄêµÁ¤Ï¼¡¤Î¤â¤Î¤ÈƱ¤¸.."
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ %s ¤ÇÄêµÁ¤µ¤ì¤Æ¤Þ¤»¤ó"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "·Ù¹ð: ¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤»¤ó"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "Ã×̿Ū¤Ê¥¨¥é¡¼¤Î¿ô¤Ï %d ¤Ç¤¹"
-#: src/msgcmp.c:420 src/msgfmt.c:1324 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "¥á¥Ã¥»¡¼¥¸¤ÎÄêµÁ¤¬½ÅÊ£¤·¤Æ¤¤¤Þ¤¹"
-#: src/msgcmp.c:421 src/msgfmt.c:1325 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...¤³¤ì¤ÏºÇ½é¤ËÄêµÁ¤µ¤ì¤¿¤È¤³¤í¤Ç¤¹"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version ¥ô¥¡¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
" -w, --width=NUMBER ¥Ú¡¼¥¸Éý¤ÎÀßÄê\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:391
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤Þ¤»¤ó"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬Í×"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:253 src/msgfilter.c:362
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
msgid "write to stdout failed"
msgstr ""
-#: src/msgexec.c:337 src/msgfilter.c:599
+#: src/msgexec.c:337 src/msgfilter.c:603
#, c-format
msgid "write to %s subprocess failed"
msgstr ""
-#: src/msgfilter.c:259
+#: src/msgfilter.c:263
#, fuzzy
msgid "missing filter name"
msgstr "°ú¿ô¤¬·çÇ¡"
-#: src/msgfilter.c:283
+#: src/msgfilter.c:287
#, fuzzy
msgid "at least one sed script must be specified"
msgstr "¾¯¤Ê¤¯¤È¤âÆó¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ²¼¤µ¤¤"
-#: src/msgfilter.c:347
+#: src/msgfilter.c:351
#, c-format, no-wrap
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr ""
-#: src/msgfilter.c:352
+#: src/msgfilter.c:356
#, no-wrap
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
-#: src/msgfilter.c:378
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgfilter.c:384
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:393
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version ¥ô¥¡¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
" -w, --width=NUMBER ¥Ú¡¼¥¸Éý¤ÎÀßÄê\n"
-#: src/msgfilter.c:551
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgfilter.c:579
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgfilter.c:630
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgfilter.c:646
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d ¸Ä¤ÎËÝÌõ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ¸Ä¤ÎÛ£Ëæ¤ÊËÝÌõ"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d ¸Ä¤ÎËÝÌõ¤µ¤ì¤Ê¤¤¥á¥Ã¥»¡¼¥¸"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "ÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥·¡¼¥±¥ó¥¹¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ %s ¤ÇÄêµÁ¤µ¤ì¤Æ¤Þ¤»¤ó"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ %s ¤ÇÄêµÁ¤µ¤ì¤Æ¤Þ¤»¤ó"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' ¤È `msgid_plural' ¤ÎÁÐÊý¤ò \\n ¤Ç»Ï¤á¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' ¤È `msgstr[%u]' ¤ÎÁÐÊý¤ò \\n ¤Ç»Ï¤á¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ¤È `msgstr' ¤ÎÁÐÊý¤ò \\n ¤Ç»Ï¤á¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' ¤È `msgid_plural' ¤ÎÁÐÊý¤ò \\n ¤Ç½ªÎ»¤µ¤»¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' ¤È `msgstr[%u]' ¤ÎÁÐÊý¤ò \\n ¤Ç½ªÎ»¤µ¤»¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ¤È `msgstr' ¤ÎÁÐÊý¤ò \\n ¤Ç½ªÎ»¤µ¤»¤Æ²¼¤µ¤¤"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1089
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1123
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1131
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1165
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "¥Ø¥Ã¥À¡¼¥Õ¥£¡¼¥ë¥É`%s'¤¬¤¢¤ê¤Þ¤»¤ó"
-#: src/msgfmt.c:1168
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "¥Ø¥Ã¥À¡¼¥Õ¥£¡¼¥ë¥É`%s'¤ò¹Ô¤ÎÀèƬ¤«¤é»Ï¤á¤Æ¤¯¤À¤µ¤¤"
-#: src/msgfmt.c:1177
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÎÃæ¤Ë½é´üÃͤΤޤޤΤâ¤Î¤¬¤¢¤ê¤Þ¤¹"
-#: src/msgfmt.c:1188
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "¥Õ¥£¡¼¥ë¥É %s ¤Ï̤¤À¤Ë½é´üÃͤΤޤޤǤ¹"
-#: src/msgfmt.c:1229
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: ·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤¤«¡¢Û£Ë椫¡¢¤¢¤ë¤¤¤Ï̵¸ú¤Ç¤¹\n"
"%*s ·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤¬¤Ç¤¤Þ¤»¤ó"
-#: src/msgfmt.c:1232
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"%s: ·Ù¹ð: ¥Ø¥Ã¥À¤Ëʸ»ú¥»¥Ã¥È¤Îµ½Ò¤¬¤¢¤ê¤Þ¤»¤ó\n"
"%*s ·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤Ï¤Ç¤¤Ê¤¤¤Ç¤·¤ç¤¦"
-#: src/msgfmt.c:1242
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: ·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤¤«¡¢Û£Ë椫¡¢¤¢¤ë¤¤¤Ï̵¸ú¤Ç¤¹\n"
"%*s ·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤¬¤Ç¤¤Þ¤»¤ó"
-#: src/msgfmt.c:1244
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1269
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domain ̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤ¢¤ê¤Þ¤»¤ó"
-#: src/msgfmt.c:1274
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domain ̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤ¢¤ê¤Þ¤»¤ó: prefix ¤òÍѤ¤¤Þ¤¹"
-#: src/msgfmt.c:1285
+#: src/msgfmt.c:1325
#, fuzzy, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s'¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "¶õ¤Î`msgstr'¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿"
-#: src/msgfmt.c:1358
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "Û£Ëæ¤Ê`msgstr'¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿"
-#: src/msgfmt.c:1427
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ËÛ£Ëæ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version ¥ô¥¡¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
" -w, --width=NUMBER ¥Ú¡¼¥¸Éý¤ÎÀßÄê\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:894 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:899 src/msginit.c:951 src/msginit.c:1089
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1074
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1454
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
" Àµ³Î¤Ê°ìÃפ¬¤Ê¤¤¤È¤³¤í¤Ç¤Ï¡¢¤è¤êÂÅÅö¤Ê·ë²Ì¤òÆÀ¤ë¤¿¤á¤ËÛ£Ëæ¤Ê°ìÃ×ÊýË¡¤¬ºÎÍÑ\n"
"¤µ¤ì¤ë¡£·ë²Ì¤Ï¥Õ¥¡¥¤¥ë»ØÄ꤬¤Ê¤¤¸Â¤êɸ½à½ÐÎϤ˽ñ¤½Ð¤µ¤ì¤ë¡£\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ %s ¤ÇÄêµÁ¤µ¤ì¤Æ¤Þ¤»¤ó"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»ÈÍѤµ¤ì¤Æ¤Þ¤¹¤¬ %s ¤ÇÄêµÁ¤µ¤ì¤Æ¤Þ¤»¤ó"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
msgstr "%s: ´û¸ %d + »²¾È %d, Í»¹ç %d, Û£Ëæ %d, ·çÇ¡ %d, ÈóºÎÍÑ %d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " ´°Î»¤·¤Þ¤·¤¿\n"
"¥á¥Ã¥»¡¼¥¸¤ÏËÝÌõ¤µ¤ì¤Æ¤¤¤ë\n"
"¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"%s: ·Ù¹ð: ʸ»ú¥»¥Ã¥È\"%s\"¤Ï²ÄÈÂÀ¤Î¤Ê¤¤¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤¹\n"
"%*s ·Ù¹ð: ʸ»ú¥»¥Ã¥ÈÊÑ´¹¤Ï¤Ç¤¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
#, fuzzy
msgid ""
"Charset missing in header.\n"
"%s: ·Ù¹ð: ¥Ø¥Ã¥À¤Ëʸ»ú¥»¥Ã¥È¤Îµ½Ò¤¬¤¢¤ê¤Þ¤»¤ó\n"
"%*s ·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤Ï¤Ç¤¤Ê¤¤¤Ç¤·¤ç¤¦"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "`msgstr[]' ¤Î¹àÌܤ¬·çÇ¡¤·¤Æ¤¤¤Þ¤¹"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr " msgid_plural ¤Î¹àÌܤ¬·çÇ¡¤·¤Æ¤¤¤Þ¤¹"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr " msgstr ¤Î¹àÌܤ¬·çÇ¡¤·¤Æ¤¤¤Þ¤¹"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤ë¤¿¤á¼Â¹Ô¤òÃæ»ß¤·¤Þ¤·¤¿"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
#, fuzzy
msgid "invalid multibyte sequence"
msgstr "ÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥·¡¼¥±¥ó¥¹¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "ÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥·¡¼¥±¥ó¥¹¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "ÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥·¡¼¥±¥ó¥¹¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:287
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr " \"%s\" ¤òÆɤ߹þ¤àºÝ¤Ë¥¨¥é¡¼"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "¥¡¼¥ï¡¼¥É \"%s\" ¤òǧ¼±¤Ç¤¤Þ¤»¤ó"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "ÉÔÀµ¤Ê¥³¥ó¥È¥í¡¼¥ë¥·¡¼¥±¥ó¥¹¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "ʸ»úÎó¤ÎÃæÅӤǥե¡¥¤¥ë¤¬½ªÎ»¤·¤Þ¤·¤¿"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "ʸ»úÎó¤ÎÃæ¤Ç²þ¹Ô¤·¤Æ¤¤¤Þ¤¹"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤ÏÀڵͤá¤é¤ì¤Þ¤·¤¿"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "\"%s\" ¤Î¥ª¥Õ¥»¥Ã¥È°ÌÃÖ %ld ¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "¥Õ¥¡¥¤¥ë\"%s\" ¤Ï¥Ì¥ëʸ»ú¤Ç½ªÎ»¤·¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "¥Õ¥¡¥¤¥ë\"%s\" ¤Ï GNU ¤Î MO ·Á¼°¤Ç¤¢¤ê¤Þ¤»¤ó"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Î½ñ¤¹þ¤ß¥¨¥é¡¼"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\"¤òºîÀ®¤Ç¤¤Ê¤¤"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Î½ñ¤¹þ¤ß¥¨¥é¡¼"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" ¤Î¥ª¡¼¥×¥ó¤Ç¥¨¥é¡¼"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"¹ñºÝ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹`\\%c'¤ò¤Õ¤¯¤ó¤Ç¤Ï¤Ê¤ê¤Þ¤»¤ó "
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë \"%s\"¤òºîÀ®¤Ç¤¤Ê¤¤"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "ɸ½à½ÐÎÏ"
-#: src/x-c.c:936
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ·Ù¹ð: ʸ»úÎóÄê¿ô¤¬´°·ë¤·¤Æ¤¤¤Þ¤»¤ó"
-#: src/x-c.c:960
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ·Ù¹ð: ʸ»úÎ󤬴°·ë¤·¤Æ¤¤¤Þ¤»¤ó"
-#: src/x-po.c:106 src/xgettext.c:608
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï domain Ì¿Î᤬¤¢¤ê¤Þ¤»¤ó"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:378
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing ¤Ïɸ½à½ÐÎϤ˽ÐÎϤ¹¤ë»þ¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó"
-#: src/xgettext.c:383
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "¸¡º÷¤¹¤Ù¤¥¡¼¥ï¡¼¥É¤Ê¤·¤Ç¤Ï xgettext ¤Ïµ¡Ç½¤·¤Þ¤»¤ó"
-#: src/xgettext.c:471
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë`%s'¤Î³ÈÄ¥»Ò`%s'¤òǧ¼±¤Ç¤¤Þ¤»¤ó; C ¤È¤ß¤Ê¤·¤Þ¤¹"
-#: src/xgettext.c:512
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:517
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:532
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:541
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:550
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:559
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:569
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version ¥ô¥¡¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
" -w, --width=NUMBER ¥Ú¡¼¥¸Éý¤ÎÀßÄê\n"
-#: src/xgettext.c:788
+#: src/xgettext.c:796
msgid "standard input"
msgstr "ɸ½àÆþÎÏ"
-#: src/xgettext.c:903
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1172
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "¸À¸ì %s ¤òǧ¼±¤Ç¤¤Þ¤»¤ó"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "°ú¿ô %u ¤ËÂФ¹¤ë¥Õ¥©¡¼¥Þ¥Ã¥ÈÍͼ°¤¬°Û¤Ê¤ê¤Þ¤¹"
+
#~ msgid "while creating hash table"
#~ msgstr "¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ëºÝ¤Ë"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-12 11:04+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=EUC-KR\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: lib/argmatch.c:134
msgid "error after reading \"%s\""
msgstr "\"%s\" ÆÄÀÏÀ» ÀÐÀº ÈÄ¿¡ ¿À·ù ¹ß»ý"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ¼½Ä ÁöÁ¤ÀÚÀÇ °³¼ö°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "'msgid'¿Í '%s'¿¡ ¾²ÀÎ ÀÎÀÚ %u¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ %1$u¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "ÀÎÀÚ %u¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ {%1$u}¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "ÀÎÀÚ {%u}¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "ÀÎÀÚ '%s'¿¡ ´ëÇÑ 'msgid'¿Í '%s'ÀÇ ¼½Ä ÁöÁ¤ÀÌ °°Áö ¾Ê½À´Ï´Ù"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "ÀÎÀÚ %u¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ '%s'¿¡ ¾ø½À´Ï´Ù"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "'%2$s' ¾È¿¡ ÀÖ´Â, ÀÎÀÚ %1$u¿¡ ´ëÇÑ ¼½Ä ÁöÁ¤ÀÌ 'msgid'¿¡ ¾ø½À´Ï´Ù"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address È£½ºÆ®À̸§¿¡ ´ëÇÑ ÁÖ¼Ò\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "È£½ºÆ®À̸§À» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "ÃÖ´ë ÇÑ °³ÀÇ ÀÔ·ÂÆÄÀϸ¸ÀÌ Çã¿ëµË´Ï´Ù"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s°ú(¿Í) %sÀº(´Â) ¼·Î ¹èŸÀûÀÔ´Ï´Ù"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "»ç¿ë¹ý: %s [¿É¼Ç] [ÀÔ·ÂÆÄÀÏ]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "±ä ¿É¼Ç¿¡¼ ²À ÇÊ¿äÇÑ Àμö´Â ªÀº ¿É¼Ç¿¡µµ ²À ÇÊ¿äÇÕ´Ï´Ù.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"¸¸¾à ÀÔ·Â ÆÄÀÏÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò°Å³ª \"-\"ÀÎ °æ¿ì, Ç¥ÁØ ÀÔ·ÂÀ» ÀнÀ´Ï´Ù.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid_plural "found %d fatal errors"
msgstr[0] "%d°³ÀÇ Ä¡¸íÀûÀÎ ¿À·ù¸¦ ã¾Ò½À´Ï´Ù"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "Áߺ¹µÈ ¸Þ½ÃÁö Á¤ÀÇ"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...¿©±â´Â ù¹ø° Á¤ÀÇÀÇ À§Ä¡ÀÔ´Ï´Ù"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr¿¡ Å°º¸µå ´ÜÃàÅ° '%c' Ç¥½Ã°¡ ³Ê¹« ¸¹½À´Ï´Ù"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "Çì´õ¿¡ Çì´õÇʵå `%s'°¡ ºüÁ³À½"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "Çì´õ Çʵå `%s'´Â ÇàÀÇ Ã³À½ºÎÅÍ ½ÃÀÛÇØ¾ß ÇÕ´Ï´Ù"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "¸î¸î Çì´õ Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "`%s' Çʵ尡 ¾ÆÁ÷µµ ÃʱâÀÇ ³»Á¤°ªÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ºüÁ³°Å³ª À߸øµÇ¾ú½À´Ï´Ù\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "°æ°í: ¹®Àڼ º¯È¯ÀÌ µ¿ÀÛÇÏÁö ¾ÊÀ» °ÍÀÔ´Ï´Ù\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "°æ°í: PO ÆÄÀÏ Çì´õ°¡ ÆÛÁöÀÔ´Ï´Ù\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "°æ°í: °ú°Å ¹öÀüÀÇ msgfmtÀº ¿©±â¿¡ ¿À·ù¸¦ ³¾ °ÍÀÔ´Ï´Ù\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "µµ¸ÞÀÎÀ̸§ \"%s\"´Â ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"µµ¸ÞÀÎÀ̸§ \"%s\"´Â ÆÄÀÏ À̸§À¸·Î ¾Ë¸ÂÁö ¾Ê½À´Ï´Ù. ±×·¯¹Ç·Î Á¢µÎ»ç¸¦\n"
"»ç¿ëÇÒ °ÍÀÔ´Ï´Ù"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' Áö½ÃÀÚ´Â ¹«½ÃµÊ"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "ºó `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ÆÛÁö `msgstr' Ç׸ñÀº ¹«½ÃµÊ"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "'%c' ¿É¼ÇÀº 'K'³ª 'T'°¡ ÁöÁ¤µÇ±â Àü¿¡´Â ¾µ ¼ö ¾ø½À´Ï´Ù"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"¹ø¿ª ¸ñ·Ï¿¡¼ ÁÖ¾îÁø ÆÐÅÏ¿¡ ¸Â´Â ¸Þ¼¼Áö ȤÀº ÁÖ¾îÁø ¼Ò½º ÆÄÀÏ¿¡ µé¾î ÀÖ´Â\n"
"¸Þ¼¼Áö¸¸À» »Ì¾Æ ³À´Ï´Ù.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=<ÆÄÀÏ> \"ÆÐÅÏ\"À» <ÆÄÀÏ>¿¡¼ °¡Á®¿É´Ï´Ù\n"
" -i, --ignore-case ´ë¼Ò¹®ÀÚ ±¸º°À» ÇÏÁö ¾Ê½À´Ï´Ù\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output Á¤·ÄµÈ Ãâ·ÂÀ» ¸¸µì´Ï´Ù\n"
" --sort-by-file ÆÄÀÏÀÇ À§Ä¡¿¡ µû¶ó Ãâ·ÂÀ» Á¤·ÄÇÕ´Ï´Ù\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "grep ¼ºê ÇÁ·Î¼¼½º¿¡ ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù"
msgid "English translations for %s package"
msgstr "%s ÆÐÅ°Áö¿¡ ´ëÇÑ Çѱ¹¾î ¹ø¿ª¹®"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "ÇöÀç ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "ÀÔ·Â ÆÄÀÏ¿¡ µÎ °³ÀÇ ¹®Àڼ \"%s\"°ú(¿Í) \"%s\"ÀÌ(°¡) Á¸ÀçÇÕ´Ï´Ù"
"ÀÔ·Â ÆÄÀÏ `%2$s'ÀÇ µµ¸ÞÀÎ \"%1$s\"¿¡´Â ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖ"
"Áö ¾Ê½À´Ï´Ù"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "¸ñÇ¥ ¹®Àڼ \"%s\"Àº(´Â) ³Î¸® ¾µ ¼ö ÀÖ´Â ÀÎÄÚµù À̸§ÀÌ ¾Æ´Õ´Ï´Ù"
"'%s'·Î(À¸·Î) Ãâ·ÂÇÏ´Â °ÍÀÌ Æ²·ÈÀ» ¼ö ÀÖ½À´Ï´Ù.\n"
"°¡´ÉÇÑ ÇØ°áÃ¥Àº LC_ALL=C ·Î ¼¼ÆÃÇÏ´Â °ÍÀÔ´Ï´Ù.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "º¯È¯ ½ÇÆÐ"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "ÀÔ·Â ÆÄÀÏÀº ¹®ÀÚ¼ÂÀ» ÁöÁ¤ÇÏ´Â Çì´õ Ç׸ñÀÌ µé¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"\"%s\"¿¡¼ \"%s\"·Î(À¸·Î) º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù. %sÀº(´Â) iconv()¿¡ ÀÇÁ¸ÇÏÁö"
"¸¸, iconv()°¡ ÀÌ°°Àº º¯È¯À» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"\n"
"Ç¥ÁØ Å½»ö µð·ºÅ丮: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<Ç¥ÁØÀÔ·Â>"
msgid "iconv failure"
msgstr "iconv ½ÇÆÐ"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "\"%s\"À»(¸¦) Àд µ¿¾È ¿À·ù ¹ß»ý"
msgid "standard output"
msgstr "Ç¥ÁØ Ãâ·Â"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ »ó¼ö"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: °æ°í: ¿Ï°áµÇÁö ¾ÊÀº ¹®ÀÚ¿ »ó¼ö"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "fout tijdens openen om te lezen van \"%s\""
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "fout bij openen om te schrijven van \"%s\""
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "fout tijdens lezen \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "fout bij schrijven bestand \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "fout tijdens lezen \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Onbekende systeemfout"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: optie `-W %s' staat geen argument toe\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
#, fuzzy
msgid "memory exhausted"
msgstr "Geen geheugen meer beschikbaar"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "aantal formaat specificaties in `msgid' en `msgstr' zijn niet gelijk"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n"
"SPECIFIEK DOEL.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Geschreven door %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "te veel argumenten"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "ontbrekende argumenten"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMEIN] MSGID ontvang vertaalde meldingen corresponderend aan\n"
" MSGID vanuit TEKSTDOMEIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"worden de in de katalogus gevonden meldingen vertaald.\n"
"Standaard zoek directory: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Meld fouten via <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s en %s zijn mutually exclusive"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "geen invoerbestanden gegeven"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "precies 2 invoerbestanden zijn benodigd"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"overeenkomst niet gevonden kan wrden, zal fuzzy(vage) matching worden gebruikt,\n"
"ter verkrijging van een betere diagnose.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "deze melding is gebruikt maar is niet gedefinieerd..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...maar de definitie is gelijksoortig"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "waarschuwing: deze melding is niet gebruikt"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d fatale fouten gevonden"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "dubbele melding definitie"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...dit is de lokatie van de eerste definitie"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "geen invoerbestand gegeven"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "precies 2 invoerbestanden zijn benodigd"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "ontbrekende argumenten"
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
+#: src/msgexec.c:228
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:343
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#: src/msgexec.c:233
+#, no-wrap
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:242
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "ontbrekende argumenten"
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr ""
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d vertaalde meldingen"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d vage vertalingen"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d onvertaalde meldingen"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "illegale kontrol sequence"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
+msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "deze melding is gebruikt maar niet gedefinieerd in %s"
+msgstr[1] "deze melding is gebruikt maar niet gedefinieerd in %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' en `msgstr' ingangen beginnen niet allebei met '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' en `msgstr' ingangen eindigen niet allebei met '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "header(??)veld `%s' ontbreekt in header(??)"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "header(??)veld `%s' moet starten aan het begin van de regel"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
"sommige header(??)velden hebben nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "veld `%s' heeft nog de oorspronkelijke standaard waarde"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeinnaam \"%s\" niet bruikbaar als bestandsnaam"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"domeinnaam \"%s\" niet bruikbaar als bestandsnaam: zal voorvoegsel gebruiken"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domein %s' directive genegeerd"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "lege `msgstr' entry genegeerd"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "lege `msgstr' ingang genegeerd"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"worden om betere resultaten te verkrijgen. De resultaten worden naar \n"
"standaarduitvoer geschreven tenzij een uitvoerbestand is gespecificeerd.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "deze melding is gebruikt maar niet gedefinieerd in %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLees %d oud + %d referentie, samengevoegd %d, fuzzied(gevaagd) %d, "
"ontbrekend %d, overbodig %d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " done.\n"
"worden de in de katalogus gevonden meldingen vertaald.\n"
"Standaard zoek directory: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
#, fuzzy
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr "%s: let op: broncode bevat vage vertaling"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "ontbrekend `msgstr' gedeelte"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "ontbrekend `msgstr' gedeelte"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "ontbrekend `msgstr' gedeelte"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "te veel fouten, afgebroken"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
#, fuzzy
msgid "invalid multibyte sequence"
msgstr "illegale kontrol sequence"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "illegale kontrol sequence"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "illegale kontrol sequence"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "fout tijdens lezen \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "sleutelwoord \"%s\" onbekend"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
#, fuzzy
msgid "invalid control sequence"
msgstr "illegale kontrol sequence"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "einde-bestand-teken in string"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "einde-regel-teken in string"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "bestand \"%s\" ingekort"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "zoek \"%s\" offset %ld gefaald"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "bestand \"%s\" is geen GNU .mo bestand"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "bestand \"%s\" is geen GNU .mo bestand"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "te veel argumenten"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "fout bij schrijven bestand \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "fout bij schrijven bestand \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "fout bij openen om te schrijven van \"%s\""
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"geonternationaliseerde meldingen mogen geen `\\%c' escape sequences bevatten"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standaard uitvoer"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: let op: niet getermineerde karakter konstante"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: let op: niet getermineerde string literal"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "dit bestand mag geen domein directives bevatten"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
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:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, 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:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version toon versie-informatie en bekindig programma\n"
" -W, --width=NUMBER stel uitvoer pagina breedte in\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standaard invoer"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "taal `%s' onbekend"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "formaat specificaties voor argument %u zijn niet dezelfde"
+
#~ msgid "while creating hash table"
#~ msgstr "tijdens aanmaken hash tabel"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, fuzzy, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under skriving av fila \"%s\""
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "feil under skriving av fila \"%s\""
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr ""
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flagg «--%s» tek ikkje argument\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr ""
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "kan ikkje opprette utfila \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "format-spesifiseringane for argument %u er ulike"
+
+#: src/format-java.c:700
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "format-spesifiseringane for argument %u er ulike"
+
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-lisp.c:3402
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "format-spesifiseringane for argument %u er ulike"
+
+#: src/format-python.c:397
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
-#: src/format-python.c:399
-#, fuzzy
+#: src/format-python.c:409
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
"mapping"
msgstr ""
"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje overeins"
-#: src/format-python.c:422
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
-msgstr "format-spesifiseringane for argument %u er ulike"
-
-#: src/format-python.c:432
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "format-spesifiseringane for argument %u er ulike"
-
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "format-spesifiseringane for argument %u er ulike"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
#, fuzzy
msgid "too many arguments"
msgstr "manglar argument"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "manglar argument"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for meir informasjon\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID hent oversett melding som stemmer overeins med\n"
" MSGID frå TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker kvarandre"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
#, fuzzy
msgid "no input files given"
msgstr "inga innfil spesifisert"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "treng nøyaktig to innfiler"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"oversett alle meldingar i programmet. Der samsvar ikkje kan finnast, vert\n"
"«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "denne meldinga er brukt, men ikkje definert..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "... men denne definisjonen liknar"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "advarsel: denne meldinga er ikkje brukt"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "fann %d fatale feil"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr ""
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
#, fuzzy
msgid "...this is the location of the first definition"
msgstr "den første definisjonen finst her"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "inga innfil spesifisert"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "treng nøyaktig to innfiler"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "manglar argument"
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
+#: src/msgexec.c:228
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:343
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#: src/msgexec.c:233
+#, no-wrap
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:242
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "manglar argument"
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr ""
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
msgid "invalid nplurals value"
msgstr ""
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
+msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
+msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "filhovud-feltet «%s» manglar i filhovud"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "nokre filhovud-felt har framleis sin initielle verdi"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "feltet «%s» har framleis sin forvalgte verdi"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"resultat. Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
"spesifisert.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
"utdaterte %d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr ""
"staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr ""
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "manglar «msgstr»-seksjon"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "for mange feil, avsluttar"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr ""
-#: src/po-lex.c:571
+#: src/po-lex.c:573
msgid "incomplete multibyte sequence at end of file"
msgstr ""
-#: src/po-lex.c:581
+#: src/po-lex.c:583
msgid "incomplete multibyte sequence at end of line"
msgstr ""
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, fuzzy, c-format
msgid "error while reading \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr ""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr ""
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr ""
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr ""
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen \"%s\" er avkutta"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "«seek» \"%s\" posisjon %ld feila"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "fila \"%s\" er ikkje i GNU .mo-format"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "fila \"%s\" er ikkje i GNU .mo-format"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "manglar argument"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "feil under skriving av fila \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "feil under skriving av fila \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "feil under skriving av fila \"%s\""
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "kan ikkje opprette utfila \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr ""
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" --strict lag strengt Uniforum-konformt utdata\n"
" -V, --version vis programversjon og avslutt\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr ""
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr ""
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringane for argument %u er ulike"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringane for argument %u er ulike"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringane for argument %u er ulike"
+
#~ msgid "while creating hash table"
#~ msgstr "mens hash-tabellen vart laga"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.37\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-05-09 02:08+02:00\n"
"Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
"Language-Team: Norwegian-bokmål <no@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "feil under åpning av «%s» for lesing"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "feil under åpning av «%s» for skriving"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "feil under lesing av «%s»"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "feil under skriving av filen «%s»"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "feil under lesing av «%s»"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Ukjent systemfeil"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "minnet oppbrukt"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "kan ikke opprette utfilen «%s»"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "format-spesifiseringene for argument %lu er ulike"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "format-spesifiseringene for argument %lu er ulike"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "format-spesifiseringene for argument %lu er ulike"
# Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
# Er denne oversettelsen grei nok?
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT\n"
"FORMÅL.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Skrevet av %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "for mange argumenter"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "mangler argumenter"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID hent oversatt melding som stemmer overens med MSGID\n"
" fra TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"stedet blir funne meldinger i den valgte katalogen oversatt.\n"
"Standard søkekatalog er: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s og %s utelukker hverandre"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n"
"bli bevart.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "ingen innfiler angitt"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "trenger nøyaktig to innfiler"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"alle meldingene i programmet ditt. Når en eksakt overensstemmelse ikke\n"
"finnes, blir «fuzzy»-sammenligning brukt for å få en bedre diagnostikk.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "denne meldingen er brukt, men ikke definert..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "... men denne definisjonen ligner"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "denne meldingen er brukt, men ikke definert i %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "advarsel: denne meldingen er ikke brukt"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "fant %d fatale feil"
msgstr[1] "fant %d fatale feil"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "duplisert definisjon av melding"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "... dette er lokasjonen til den første definisjonen"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "ingen innfil angitt"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "trenger nøyaktig to innfiler"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "mangler argumenter"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "minst to filer må angis"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "mangler argumenter"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "minst to filer må angis"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d oversatt melding"
msgstr[1] "%d oversatte meldinger"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d antatt oversettelse"
msgstr[1] ", %d antatte oversettelser"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d uoversatt melding"
msgstr[1] ", %d uoversatte meldinger"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "ulovlig kontrollsekvens"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
+msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
+msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "filhodefelt «%s» mangler i filhode"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "noen filhodefelt har fremdeles sin initielle verdi"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
"%*s advarsel: tegnsettkonvertering vil ikke virke"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"Tegnsettet mangler i headeren.\n"
"Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
"%*s advarsel: tegnsettkonvertering vil ikke virke"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domenenavnet «%s» passer ikke som filnavn"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "nøkkelord «domain %s» ignorert"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "tom «msgstr»-linje ignorert"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "antatt «msgstr»-linje ignorert"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: advarsel: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
"og iconv() støtter ikke \"%s\".\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
"Denne versjonen ble blygget uten iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"resultater. Resultatet blir skrevet til standard ut, med mindre en utfil\n"
"er spesifisert.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "denne meldingen er brukt, men ikke definert i %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "denne meldingen er brukt, men ikke definert i %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
"foreldete %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " ferdig.\n"
"miljøvariabelen TEXTDOMAINDIR.\n"
"Standard søkekatalog er: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: advarsel: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
"Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Fortsetter likevel, forvent parsefeil."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Fortsetter likevel."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
"og iconv() støtter ikke \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
"vil rette dette problemet.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
"Denne versjonen ble blygget uten iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"Tegnsettet mangler i headeren.\n"
"Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "inkonsistent bruk av #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "mangler «msgstr[]»-seksjon"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "mangler «msgid_plural»-seksjon"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "mangler «msgstr»-seksjon"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "første flertallsform har en ikke-null indeks"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "flertallsform har feil indeks"
msgid "too many errors, aborting"
msgstr "for mange feil, avbryter"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "ulovlig multibytesekvens"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "ulovlig multibytesekvens"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "ulovlig multibytesekvens"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "feil under lesing av «%s»"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "nøkkelord «%s» ukjent"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "ulovlig kontrollsekvens"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "slutt-på-fil inne i streng"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "slutt-på-linje inne i streng"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "filen «%s» er avkuttet"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "«seek» «%s» posisjon %ld mislyktes"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "filen «%s» er ikke i GNU .mo-format"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "for mange argumenter"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "feil under skriving av filen «%s»"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "kan ikke opprette utfilen «%s»"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "feil under skriving av filen «%s»"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "feil under åpning av «%s» for skriving"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "kan ikke opprette utfilen «%s»"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standard ut"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "denne filen kan ikke inneholde domene-direktiver"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
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:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, 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:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "standard inn"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "språket «%s» er ukjent"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringene for argument %lu er ulike"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringene for argument %lu er ulike"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "format-spesifiseringene for argument %lu er ulike"
+
#~ msgid "while creating hash table"
#~ msgstr "mens hash-tabellen ble laget"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.39\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-08-01 23:50+0200\n"
"Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "b³±d w czasie otwierania \"%s\" do czytania"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "b³±d otwarcia \"%s\" do pisania"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "b³±d w czasie czytania \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "b³±d podczas pisania do pliku \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "b³±d w czasie czytania \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Nieznany b³±d systemu"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "nie zgadza siê ilo¶æ specyfikacji formatu w `msgid' i w `msgstr'"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji MO¯LIWO¦CI\n"
"SPRZEDA¯Y lub PRZYDATNO¦CI DO KONKRETNYCH ZASTOSOWAÑ.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Zapisane przez %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "za du¿o argumentów"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "brakuj±ce argumenty"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID wydob±d¼ z TEXTDOMAIN przet³umaczony komunikat\n"
" odpowiadaj±cy MSGID\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"wybranym katalogu.\n"
"Domy¶lnie przeszukiwany katalog: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s i %s wzajemnie siê wykluczaj±"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"ale tylko w pierwszym definiuj±cym je pliku PO. Pozycje w plikach dla\n"
"wszystkich plików PO te¿ zostan± zachowane.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n"
" -w, --width=LICZBA ustalenie szeroko¶ci strony\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "nie podano nazw plików wej¶ciowych"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"komunikaty w programie zosta³y przet³umaczone. Tam gdzie nie mo¿na\n"
"porównaæ dok³adnie u¿ywane jest porównanie rozmyte, dla lepszej diagnostyki.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...ale ta definicja jest podobna"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "uwaga: ten komunikat nie jest u¿yty"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[1] "znaleziono %d b³êdy krytyczne"
msgstr[2] "znaleziono %d b³êdów krytycznych"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "podwójna definicja komunikatu"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...to jest po³o¿enie pierwszej definicji"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n"
" -w, --width=LICZBA ustalenie szeroko¶ci strony\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "nie podano nazwy pliku wej¶ciowego"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "brakuj±ce argumenty"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "musz± byæ podane przynajmniej dwa pliki"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "brakuj±ce argumenty"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "musz± byæ podane przynajmniej dwa pliki"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n"
" -w, --width=LICZBA ustalenie szeroko¶ci strony\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[1] "%d przet³umaczone komunikaty"
msgstr[2] "%d przet³umaczonych komunikatów"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[1] ", %d t³umaczenia budz± w±tpliwo¶ci"
msgstr[2] ", %d t³umaczeñ budzi w±tpliwo¶ci"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[1] ", %d nie przet³umaczone komunikaty"
msgstr[2] ", %d nie przet³umaczonych komunikatów"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "b³êdna sekwencja steruj±ca"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
+msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
+msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
+msgstr[1] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
+msgstr[2] "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "linie `msgid' i `msgid_plural' nie zaczynaj± siê obie od '\\n'`"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "linie `msgid' i `msgstr[%u]' nie zaczynaj± siê obie od '\\n'`"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "linie `msgid' i `msgstr' nie zaczynaj± siê obie od '\\n'`"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "linie `msgid' i `msgid_plural' nie koñcz± siê obie na '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "linie `msgid' i `msgstr[%u]' nie koñcz± siê obie na '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "linie `msgid' i `msgstr' nie koñcz± siê obie na '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "w nag³ówku brakuje pola `%s'"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "pole nag³ówka `%s' powinno siê zaczynaæ na pocz±tku linii"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n"
"%*s uwaga: konwersja kodowania nie bêdzie dzia³aæ"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"W nag³ówku brakuje nazwy kodowania.\n"
"Przekodowanie na kodowanie u¿ytkownika nie bêdzie dzia³aæ.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: uwaga: nag³ówek pliku PO brakuj±cy, niedok³adny lub b³êdny\n"
"%*s uwaga: konwersja kodowania nie bêdzie dzia³aæ"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nazwa domeny \"%s\" nie jest odpowiedni± nazwa pliku"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u¿yjê przedrostka"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "dyrektywa `domena %s' zignorowana"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "zignorowana pusta warto¶æ `msgstr'"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "zignorowana niepewna (fuzzy) warto¶æ `msgstr'"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n"
" -w, --width=LICZBA ustalenie szeroko¶ci strony\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: ostrze¿enie: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n"
"a iconv() nie obs³uguje \"%s\".\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n"
"Ta wersja zosta³a skompilowana bez iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"dok³adnie u¿ywane jest porównanie rozmyte, dla lepszych wyników. Wyniki s±\n"
"pisane na standardowe wyj¶cie je¿eli plik wyj¶iowy nie jest podany.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sPrzeczytane %ld starych + %ld odno¶ników, %ld do³±czonych, %ld "
"niedok³adnych, %ld brakuj±cych, %ld przestarza³ych.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " zrobione.\n"
"podana przez zmienn± ¶rodowiskow± TEXTDOMAINDIR.\n"
"Domy¶lnie przeszukiwany katalog: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: ostrze¿enie: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Kodowanie \"%s\" nie ma przeno¶nej nazwy.\n"
"Przekodowanie na zestaw znaków u¿ytkownika mo¿e nie dzia³aæ\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "Kontynuacja mimo wszystko, mo¿na oczekiwaæ b³êdów analizy sk³adni."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Kontynuacja mimo wszystko."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera siê na iconv(),\n"
"a iconv() nie obs³uguje \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"Problem mo¿na rozwi±zaæ instaluj±c libiconv GNU i instaluj±c\n"
"ponownie gettext GNU.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"Kodowanie \"%s\" nie jest obs³ugiwane. %s opiera sie na iconv().\n"
"Ta wersja zosta³a skompilowana bez iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"W nag³ówku brakuje nazwy kodowania.\n"
"Przekodowanie na kodowanie u¿ytkownika nie bêdzie dzia³aæ.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "niekonsekwentne u¿ycie #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "brak czêsci `msgstr[]'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "brak czêsci `msgstr_plural'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "brak czêsci `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "pierwsza forma mnoga ma niezerowy indeks"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "forma mnoga ma z³y indeks"
msgid "too many errors, aborting"
msgstr "%s: za du¿o b³êdów, przerwanie wykonywania"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "b³êdna sekwencja wielobajtowa"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "b³êdna sekwencja wielobajtowa"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "b³êdna sekwencja wielobajtowa"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "b³±d w czasie czytania \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "nieznane s³owo kluczowe \"%s\""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "b³êdna sekwencja steruj±ca"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "znak koñca pliku wewn±trz ³añcucha"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "znak koñca wiersza wewn±trz ³añcucha"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "obciêty plik \"%s\""
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "nieudane przej¶cie do pozycji w \"%s\", ofset %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr ""
"plik \"%s\" zawiera ³añcuch znaków, który nie jest zakoñczony znakiem NUL"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "plik \"%s\" nie jest w formacie .mo GNU"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "za du¿o argumentów"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "b³±d podczas pisania do pliku \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "b³±d podczas pisania do pliku \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "b³±d otwarcia \"%s\" do pisania"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwenji `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "nie mogê utworzyæ pliku wyj¶ciowego \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "standardowe wyj¶cie"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "ten plik nie mo¿e zawieraæ dyrektyw domen"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
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:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nie mo¿e dzia³aæ bez podania s³ów kluczowych"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, 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:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version wy¶wietlenie informacji o wersji i zakoñczenie\n"
" -w, --width=LICZBA ustalenie szeroko¶ci strony\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "wej¶cie standardowe"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "nieznany jêzyk `%s'"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "specyfikacje formatu dla argumentu %lu nie s± takie same"
+
#~ msgid "while creating hash table"
#~ msgstr "podczas tworzenia tablicy mieszaj±cej"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.23\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\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"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro durante a abertura de \"%s\" para leitura"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "erro durante a abertura de \"%s\" para escrita"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "erro durante a leitura de \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "erro durante a escrita do ficheiro \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "erro durante a leitura de \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Erro desconhecido do sistema"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: a opção `--%s' não permite um argumento\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
#, fuzzy
msgid "memory exhausted"
msgstr "memória exausta"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "impossível criar o ficheiro de saída \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "as especificações do argumento %u são diferentes"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "as especificações do argumento %u são diferentes"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "as especificações do argumento %u são diferentes"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "as especificações do argumento %u são diferentes"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "as especificações do argumento %u são diferentes"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr ""
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "argumentos insuficientes"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informação\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [DIALECTO] MSGID obtém a mensagem traduzida correspondente a\n"
" MSGID do DIALECTO\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"são traduzidas.\n"
"Directório standard de pesquisa: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s são mutuamente exclusivas"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"File positions from all PO files will be cumulated.\n"
msgstr ""
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "ficheiros de entrada não fornecidos"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "são necessários exactamente 2 ficheiros"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"é usado um emparelhamento aproximado para produzir melhores\n"
"diagnósticos.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "esta mensagem é usada mas não definida..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...mas esta definição é semelhante"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensagem é usada mas não definida em %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "atenção: esta mensagem não é usada"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "encontrados %d erros fatais"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definição de mensagem duplicada"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...este é o local da primeira definição"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "nenhum ficheiro de entrada fornecido"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "são necessários exactamente 2 ficheiros"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "argumentos insuficientes"
-#: src/msgexec.c:279
-msgid "at least one sed script must be specified"
+#: src/msgexec.c:228
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:343
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+#: src/msgexec.c:233
+#, no-wrap
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:242
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "argumentos insuficientes"
+
+#: src/msgfilter.c:287
+msgid "at least one sed script must be specified"
+msgstr ""
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensagens traduzidas"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traduções aproximadas"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensagens não traduzidas"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "sequência de controlo ilegal"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "esta mensagem é usada mas não definida em %s"
+msgstr[1] "esta mensagem é usada mas não definida em %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "esta mensagem é usada mas não definida em %s"
+msgstr[1] "esta mensagem é usada mas não definida em %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
#, fuzzy
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, fuzzy, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
#, fuzzy
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "o campo `%s' falta no cabeçalho"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "o campo `%s' do cabeçalho deve começar no início da linha"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
#, fuzzy
msgid "some header fields still have the initial default value"
msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "o campo `%s' ainda tem o valor por defeito inicial"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nome de domínio \"%s\" não apropriado como nome de ficheiro:\n"
"prefixo usado"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "directiva `domínio %s' ignorada"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
#, fuzzy
msgid "fuzzy `msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"resultados serão escritos no canal de saída por defeito (stdout) a\n"
"menos que seja especificado um ficheiro de saída.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "esta mensagem é usada mas não definida em %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "esta mensagem é usada mas não definida em %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %"
"d, obsoletas %d.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr "terminado.\n"
"são traduzidas.\n"
"Directório standard de pesquisa: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr ""
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
#, fuzzy
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr ""
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
#, fuzzy
msgid "missing `msgstr[]' section"
msgstr "falta a secção `msgstr'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
#, fuzzy
msgid "missing `msgid_plural' section"
msgstr "falta a secção `msgstr'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "falta a secção `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr ""
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr ""
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
#, fuzzy
msgid "invalid multibyte sequence"
msgstr "sequência de controlo ilegal"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "sequência de controlo ilegal"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "sequência de controlo ilegal"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "erro durante a leitura de \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palavra chave \"%s\" desconhecida"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
#, fuzzy
msgid "invalid control sequence"
msgstr "sequência de controlo ilegal"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "fim-de-ficheiro dentro da cadeia"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "fim-de-linha dentro da cadeia"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "ficheiro \"%s\"truncado"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, fuzzy, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "seek \"%s\" offset %ld falhou"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, fuzzy, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "demasiados argumentos"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "erro durante a escrita do ficheiro \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "impossível criar o ficheiro de saída \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro durante a escrita do ficheiro \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "erro durante a abertura de \"%s\" para escrita"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
"as mensagens de internacionalização não devem conter\n"
"a sequência de escape `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "impossível criar o ficheiro de saída \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "canal de saída por defeito (stdout)"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "este ficheiro não pode conter directivas de domínio"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
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:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, 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:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version mostra a informação de versão e sai\n"
" -w, --width=NÚMERO especifica a largura de página na saída\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "entrada standard"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr ""
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "as especificações do argumento %u são diferentes"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "as especificações do argumento %u são diferentes"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "as especificações do argumento %u são diferentes"
+
#~ msgid "while creating hash table"
#~ msgstr "durante a criação da tabela de dispersão"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-04-03 08:25+02:00\n"
"Last-Translator: Flávio Bruno Leitner <flavio@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "erro ao abrir \"%s\" para leitura"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "erro ao abrir o arquivo \"%s\" para gravação"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "erro ao gravar o arquivo \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Erro de sistema desconhecido"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opção `-W %s' não aceita parâmetros\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "Memória insuficiente"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "não foi possível criar o arquivo de saída \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr ""
"número de especificações de formatos em `msgid' e `msgstr' não conferem"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "especificações de formato para o argumento %lu são diferentes"
+
+#: src/format-java.c:700
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "especificações de formato para o argumento %lu são diferentes"
+
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr ""
"número de especificações de formatos em `msgid' e `msgstr' não conferem"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-lisp.c:3402
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "especificações de formato para o argumento %lu são diferentes"
+
+#: src/format-python.c:397
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
msgstr ""
"número de especificações de formatos em `msgid' e `msgstr' não conferem"
-#: src/format-python.c:399
-#, fuzzy
+#: src/format-python.c:409
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
"mapping"
msgstr ""
"número de especificações de formatos em `msgid' e `msgstr' não conferem"
-#: src/format-python.c:422
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
-msgstr "especificações de formato para o argumento %lu são diferentes"
-
-#: src/format-python.c:432
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "especificações de formato para o argumento %lu são diferentes"
-
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "especificações de formato para o argumento %lu são diferentes"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"Este é um sofware livre; veja os fontes para condições de cópia. Não existe\n"
"garantia; nem mesmo COMERCIAIS ou de ATENDIMENTO A UMA DETERMINADA FINALIDADE.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "excesso de parâmetros"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "parâmetros não informados"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para maiores informações\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [DOMÍNIO] MSGID recupera mensagens traduzidas correspondentes\n"
" para MSGID no DOMÍNIO\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"mensagens encontradas no catálogo selecionado\n"
"Diretório de pesquisa padrão: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s são mutuamente exclusivos"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "critério de seleção especificado impossível (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
"os arquivos PO serão preservados.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -S, --strict habilita o modo Uniforum estrito\n"
" -V, --version apresenta informações de versão e finaliza\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "arquivos de entrada não informados"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "são necessários 2 arquivos de entrada"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"mensagens do programa foram traduzidas. Onde uma igualdade não puder ser\n"
"encontrada uma aproximação é utilizada para produzir um melhor diagnóstico.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "esta mensagem é utilizada, mas não foi definida..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...mas esta definição é similar"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensagem é utilizada mas não definida em %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "atenção: esta mensagem não é utilizada"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "encontrado %d erro fatal"
msgstr[1] "encontrados %d erros fatais"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "definição duplicada de mensagem"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...esta é a localização da primeira definição"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -S, --strict habilita o modo Uniforum estrito\n"
" -V, --version apresenta informações de versão e finaliza\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "não foi informado o arquivo de entrada"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "são necessários 2 arquivos de entrada"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "parâmetros não informados"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "pelo menos dois arquivos devem ser especificados"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
+msgstr ""
+
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "parâmetros não informados"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "pelo menos dois arquivos devem ser especificados"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -S, --strict habilita o modo Uniforum estrito\n"
" -V, --version apresenta informações de versão e finaliza\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensagem traduzida"
msgstr[1] "%d mensagens traduzidas"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d tradução aproximada (fuzzy)"
msgstr[1] ", %d traduções aproximadas (fuzzy)"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensagem não traduzida"
msgstr[1] ", %d mensagens não traduzidas"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "seqüência de controle ilegal"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "esta mensagem é utilizada mas não definida em %s"
+msgstr[1] "esta mensagem é utilizada mas não definida em %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "esta mensagem é utilizada mas não definida em %s"
+msgstr[1] "esta mensagem é utilizada mas não definida em %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' e `msgstr' não começam com '\\n'"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' e `msgstr' não começam com '\\n'"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' e `msgstr' não terminam com '\\n'"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' e `msgstr' não terminam com '\\n'"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "campo `%s' faltando no cabeçalho"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "campo `%s' deve iniciar no começo da linha"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "campo `%s' ainda possui o valor inicial"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
"%*s aviso: conversão de charset não vai funcionar"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"%s: aviso: falta o cabeçalho relativo ao charset\n"
"%*s aviso: conversão de charset não vai funcionar"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
"%*s aviso: conversão de charset não vai funcionar"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
"prefixo"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s': diretiva ignorada"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "`msgstr' vazia: mensagem ignorada"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -S, --strict habilita o modo Uniforum estrito\n"
" -V, --version apresenta informações de versão e finaliza\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, fuzzy, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, fuzzy, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
msgid "warning: "
msgstr ""
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"Os resultados serão gravados na saída padrão, a menos que um arquivo de\n"
"saída seja especificado.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "esta mensagem é utilizada mas não definida em %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "esta mensagem é utilizada mas não definida em %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, "
"perdidas %ld, obsoletas %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " feito.\n"
"mensagens encontradas no catálogo selecionado\n"
"Diretório de pesquisa padrão: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr ""
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, fuzzy, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"%s: aviso: charset \"%s\" não é um encoding portável\n"
"%*s aviso: conversão de charset pode não funcionar"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr ""
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr ""
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr ""
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-#: src/po-charset.c:295
+#: src/po-charset.c:335
#, fuzzy
msgid ""
"Charset missing in header.\n"
"%s: aviso: falta o cabeçalho relativo ao charset\n"
"%*s aviso: conversão de charset não vai funcionar"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "seção `msgstr[]' não localizada"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "seção `msgid_plural' não localizada"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "seção `msgstr' não localizada"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "primeira forma em plural tem o índice diferente de zero"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "forma plural tem o índice errado"
msgid "too many errors, aborting"
msgstr "excesso de erros - finalizando"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "sequência multibyte inválido"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "sequência multibyte inválido"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "sequência multibyte inválido"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "erro ao ler \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "palavra chave \"%s\" desconhecida"
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "seqüência de controle ilegal"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "fim de arquivo sem string"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "fim de linha sem string"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "arquivo \"%s\" truncado"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "falha na pesquisa \"%s\" offset %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "arquivo \"%s\" contém string não terminada em NULL"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "arquivo \"%s\" não está no formato GNU .mo"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "excesso de parâmetros"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "erro ao gravar o arquivo \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "não foi possível criar o arquivo de saída \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro ao gravar o arquivo \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "erro ao abrir o arquivo \"%s\" para gravação"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "não foi possível criar o arquivo de saída \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "saída padrão"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: aviso: caractere constante indeterminado"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: aviso: string literal indeterminada"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "este arquivo parece não conter diretivas de domínio"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing não pode ser usado enquanto a saída é escrita na saída padrão"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext não pode funcionar sem as teclas para procurar"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -S, --strict habilita o modo Uniforum estrito\n"
" -V, --version apresenta informações de versão e finaliza\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "entrada padrão"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "idioma `%s' desconhecido"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "especificações de formato para o argumento %lu são diferentes"
+
#~ msgid "while creating hash table"
#~ msgstr "enquanto criando tabela hash"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.40\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-09-17 07:50+0400\n"
"Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ"
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `msgstr'"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"× ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n"
"ëïííåòþåóëïê ãåîîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëïîëòåôîïê ãåìé.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" [TEXTDOMAIN] MSGID ÎÁÊÔÉ ÐÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÑ MSGID × TEXTDOMAIN\n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"×Ù×ÏÄÑÔÓÑ ÉÈ ÐÅÒÅ×ÏÄÙ ÉÚ ÕËÁÚÁÎÎÏÇÏ ÄÏÍÅÎÁ.\n"
"óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)"
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"ÔÏÌØËÏ ÉÚ ÐÅÒ×ÏÇÏ PO-ÆÁÊÌÁ, × ËÏÔÏÒÏÍ ÏÎÉ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ. ëÏÍÍÅÎÔÁÒÉÉ,\n"
"ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" -w, --width=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ ÓÔÒÁÎÉÃÙ ×Ù×ÏÄÁ ÒÁ×ÎÏÊ þéóìõ\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "ÎÅ ÚÁÄÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"ÄÉÁÇÎÏÓÔÉËÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ\n"
"ÓÏ×ÐÁÄÅÎÉÅ.\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏÇÒÁÍÍÏÊ, ÎÏ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...ÏÄÎÁËÏ ÚÄÅÓØ ÏÐÒÅÄÅÌÅÎÏ ÐÏÈÏÖÅÅ ÓÏÏÂÝÅÎÉÅ"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[1] "ÎÁÊÄÅÎÏ ËÒÉÔÉÞÅÓËÉÈ ÏÛÉÂÏË: %d"
msgstr[2] "ÎÁÊÄÅÎÏ ËÒÉÔÉÞÅÓËÉÈ ÏÛÉÂÏË: %d"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" -w, --width=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ ÓÔÒÁÎÉÃÙ ×Ù×ÏÄÁ ÒÁ×ÎÏÊ þéóìõ\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "ÎÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÎÅ ÍÅÎÅÅ Ä×ÕÈ ÆÁÊÌÏ×"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÁÒÇÕÍÅÎÔÙ"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÎÅ ÍÅÎÅÅ Ä×ÕÈ ÆÁÊÌÏ×"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" -w, --width=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ ÓÔÒÁÎÉÃÙ ×Ù×ÏÄÁ ÒÁ×ÎÏÊ þéóìõ\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[1] "ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ: %d"
msgstr[2] "ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ: %d"
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[1] ", ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÏ×: %d"
msgstr[2] ", ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÏ×: %d"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[1] ", ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ: %d"
msgstr[2] ", ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ: %d"
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "ÎÅ×ÅÒÎÁÑ ÕÐÒÁ×ÌÑÀÝÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
+msgstr[1] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
+msgstr[2] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
+msgstr[1] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
+msgstr[2] "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË "
"ÄÒÕÇÏÅ -- ÎÅÔ"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
"-- ÎÅÔ"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- "
"ÎÅÔ"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
"-- ÎÅÔ"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
"-- ÎÅÔ"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr ""
"ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- ÎÅÔ"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "ÐÒÏÐÕÝÅÎÏ ÐÏÌÅ `%s' × ÚÁÇÏÌÏ×ËÅ"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÎÏ×ÏÊ ÓÔÒÏËÉ"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr ""
"ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "ÐÏÌÅ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"ÎÅÐÒÁ×ÉÌÅÎ\n"
"%*s ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÄÉÒÏ×ËÉ ÎÅ ÓÒÁÂÏÔÁÅÔ"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"÷ ÚÁÇÏÌÏ×ËÅ ÎÅ ÕËÁÚÁÎÁ ËÏÄÉÒÏ×ËÁ.\n"
"ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÒÁÂÏÔÁÅÔ.\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"ÎÅÐÒÁ×ÉÌÅÎ\n"
"%*s ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÄÉÒÏ×ËÉ ÎÅ ÓÒÁÂÏÔÁÅÔ"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅÄÏÐÕÓÔÉÍÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÏ\n"
"ÞÁÓÔÉÞÎÏ ÕÓÅÞÅÎÎÏÅ ÉÍÑ ÄÏÍÅÎÁ"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "ÄÉÒÅËÔÉ×Á `domain %s' ÉÇÎÏÒÉÒÏ×ÁÎÁ"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "ÐÕÓÔÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ÎÅÔÏÞÎÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" -w, --width=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ ÓÔÒÁÎÉÃÙ ×Ù×ÏÄÁ ÒÁ×ÎÏÊ þéóìõ\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ iconv() ÎÅ "
"ÐÏÄÄÅÒÖÉ×ÁÅÔ \"%s\".\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().\n"
"üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ ÓÏ×ÐÁÄÅÎÉÅ. åÓÌÉ ÎÅ ÕËÁÚÁÎ\n"
"×ÙÈÏÄÎÏÊ ÆÁÊÌ, ÚÁÐÉÓØ ÐÒÏÉÚ×ÏÄÉÔÓÑ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sðÒÏÞÉÔÁÎÏ ÓÏÏÂÝÅÎÉÊ: ÓÔÁÒÙÈ %ld + ÎÏ×ÙÈ %ld; ÏÂßÅÄÉÎÅÎÏ %ld, ÐÏÍÅÞÅÎÏ "
"ÎÅÔÏÞÎÙÍÉ %ld, ÎÅÄÏÓÔÁÀÝÉÈ %ld, ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÙÈ %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " ÚÁ×ÅÒÛÅÎÏ.\n"
"ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ TEXTDOMAINDIR.\n"
"óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"\"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÎÁÚ×ÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ.\n"
"ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÍÏÖÅÔ ÎÅ ÓÒÁÂÏÔÁÔØ.\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ, ÂÕÄÕÔ ÏÛÉÂËÉ ÒÁÚÂÏÒÁ."
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "÷ÙÐÏÌÎÅÎÉÅ ÐÒÏÄÏÌÖÁÅÔÓÑ."
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ iconv() ÎÅ "
"ÐÏÄÄÅÒÖÉ×ÁÅÔ \"%s\".\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
"þÔÏÂÙ ÒÅÛÉÔØ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÕÓÔÁÎÏ×ÉÔÅ GNU libiconv É ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ GNU "
"gettext.\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"ëÏÄÉÒÏËÁ \"%s\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ. %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().\n"
"üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"÷ ÚÁÇÏÌÏ×ËÅ ÎÅ ÕËÁÚÁÎÁ ËÏÄÉÒÏ×ËÁ.\n"
"ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ Ë ËÏÄÉÒÏ×ËÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÎÅ ÓÒÁÂÏÔÁÅÔ.\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "ÎÅÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÅ ÐÒÉÍÅÎÅÎÉÅ #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgstr[]'"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgid_plural'"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "ÐÒÏÐÕÝÅÎÁ ÓÅËÃÉÑ `msgstr'"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "ÐÅÒ×ÁÑ ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÎÕÌÅ×ÏÊ ÉÎÄÅËÓ"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÎÄÅËÓ"
msgid "too many errors, aborting"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï \"%s\""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "ÎÅ×ÅÒÎÁÑ ÕÐÒÁ×ÌÑÀÝÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÓÔÒÏËÉ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "ÆÁÊÌ \"%s\" ÕÓÅÞÅÎ"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "ÏÛÉÂËÁ ÏÂÒÁÝÅÎÉÑ Ë ÆÁÊÌÕ \"%s\" ÐÏ ÓÍÅÝÅÎÉÀ %ld"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "ÆÁÊÌ \"%s\" ÓÏÄÅÒÖÉÔ ÓÔÒÏËÕ, ÎÅ ÚÁ×ÅÒÛÅÎÎÕÀ ÎÕÌÅÍ"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "ÆÁÊÌ \"%s\" ÎÅ × ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÆÏÒÍÁÔÕ GNU .mo"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr ""
"ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÉÍ×ÏÌØÎÁÑ ËÏÎÓÔÁÎÔÁ"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
# ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"ËÌÀÞ --join-existing ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÚÁÐÉÓÉ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr ""
"ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
" -w, --width=þéóìï ÕÓÔÁÎÏ×ÉÔØ ÛÉÒÉÎÕ ÓÔÒÁÎÉÃÙ ×Ù×ÏÄÁ ÒÁ×ÎÏÊ þéóìõ\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %lu"
+
#~ msgid "while creating hash table"
#~ msgstr "ÐÒÉ ÓÏÚÄÁÎÉÉ ÈÅÛ-ÔÁÂÌÉÃÙ"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-12 11:49+0100\n"
"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
msgid "error after reading \"%s\""
msgstr "chyba po èítaní \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Neznáma systémová chyba"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "poèet formátovacích znaèiek v 'msgid' a '%s' sa nezhoduje"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formátovacie znaèky v 'msgid' a '%s' pre parameter %u nie sú rovnaké"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr "formátovacia znaèka pre parameter %u v '%s' nie je v 'msgid'"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "formátovacia znaèka pre parameter %u nie je v '%s'"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "formátovacia znaèka pre parameter {%u} v '%s' nie je v 'msgid'"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formátovacia znaèka pre parameter {%u} neexistuje v '%s'"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "formátovacie znaèky v 'msgid' a '%s' pre parameter '%s' nie sú rovnaké"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "formátovacia znaèka pre parameter %u nie je v '%s'"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "formátovacia znaèka pre parameter %u v '%s' nie je v 'msgid'"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address adresy pre meno hostiteµa\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "Nemô¾em získa» meno hostiteµa"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "povolený najviac jeden vstupný súbor"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s a %s sa navzájom vyluèujú"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Pou¾itie: %s [VO¥BA] [VSTUPNÝSÚBOR]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Povinné parametre pre dlhé voµby sú povinnými aj pre skrátené voµby.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Ak nie je zadaný vstupný súbor alebo je -, naèítaný je ¹tandardný vstup.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[1] "nájdená %d záva¾ná chyba"
msgstr[2] "nájdené %d záva¾né chyby"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "duplicitná definícia správy"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...toto je miesto prvého definovania"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr obsahuje príli¹ veµa znaèiek klávesových skratiek '%c'"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "hlavièková polo¾ka `%s' chýba v hlavièke"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "hlavièková polo¾ka `%s' má zaèína» na zaèiatku riadku"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "niektoré polo¾ky hlavièky e¹te obsahujú poèiatoèné ¹tandardné hodnoty"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "polo¾ka `%s' e¹te obsahuje poèiatoènú ¹tandardnú hodnotu"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "upozornenie: hlavièka súboru PO chýba alebo je neplatná\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "upozornenie: konverzia znakovej sady nebude fungova»\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "upozornenie: hlavièka súboru PO je nepresná\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "upozornenie: star¹ie verzie msgfmt vrátia pri tomto chybu\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "meno domény \"%s\" nie je pou¾itelné ako meno súboru"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"meno domény \"%s\" nie je pou¾itelné ako meno súboru: pou¾ije sa predpona"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktíva `domain %s' bola ignorovaná"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "prázdna polo¾ka `msgstr' bola ignorovaná"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "nepresná polo¾ka `msgstr' bola ignorovaná"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "voµba '%c' nemô¾e by» pou¾itá pred ¹pecifikovaným 'K' alebo 'T'"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Vyberie v¹etky správy z prekladového katalógu, ktoré vyhovujú zadanému\n"
"vzoru alebo sú v zadaných zdrojových súboroch.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=SÚBOR získa» VZOR zo SÚBORu\n"
" -i, --ignore-case ignorova» rozlí¹enie veµkých a malých písmen\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-outout generova» utriedený výstup\n"
" --sort-by-file utriedi» výstup podµa umiestnenia v súboroch\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "zlyhal zápis do podprocesu grep"
msgid "English translations for %s package"
msgstr "Slovenské preklady pre balík %s"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "aktuálna znaková sada \"%s\" nie je prenositeµné meno kódovania"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
msgstr ""
"doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavièke uvedenú znakovú sadu"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "cieµová znaková sada \"%s\" nie je prenositeµné meno kódovania."
"Výstup z '%s' mô¾e by» nesprávny.\n"
"Mo¾nou obchádzkou je nastavenie LC_ALL=C.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "konverzia zlyhala"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "vstupný súbor nemá v hlavièke uvedenú znakovú sadu"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Nemô¾em konvertova» z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
"nepodporuje takúto konverziu."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"mô¾e by» urèené obsahom premennej prostredia TEXTDOMAINDIR.\n"
"©tandardný adresár, v ktorom sa budú hµada» katalógy: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<¹tandardný vstup>"
msgid "iconv failure"
msgstr "iconv zlyhal"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "chyba pri èítaní súboru \"%s\""
msgid "standard output"
msgstr "¹tandardný výstup"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: upozornenie: neukonèená znaková kon¹tanta"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: upozornenie: neukonèený znakový re»azec"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-14 10:29+0100\n"
"Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
"%100==4 ? 3 : 0);\n"
msgid "error after reading \"%s\""
msgstr "napaka po branju \"%s\""
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Neznana sistemska napaka"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "¹tevili formatnih doloèil v ,msgid` in ,%s` se ne ujemata"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "formatni doloèili v ,msgid` in ,%s` za argument %u nista enaki"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr "v ,msgid` ni formatnega doloèila za argument %u, kot v ,%s`"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "v ,%2$s` ni formatnega doloèila za argument %1$u"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
"'msgid'"
msgstr "v ,msgid` ni formatnega doloèila za argument {%u}, kot v ,%s`"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "v ,%2$s` ni formatnega doloèila za argument {%1$u}"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "formatni doloèili v ,msgid` in ,%s` za argument ,%s` nista enaki"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "v ,%2$s` ni formatnega doloèila za argument %1$u"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "v ,msgid` ni formatnega doloèila za argument %u, kot v ,%s`"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address internetni naslov za gostiteljsko ime\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "gostiteljskega imena ni moè ugotoviti"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "dovoljena je najveè ena vhodna datoteka"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s in %s se med seboj izkljuèujeta"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
"Èe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
"tudi za kratko obliko.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Èe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[2] "%d kritièni napaki"
msgstr[3] "%d kritiène napake"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "podvojena definicija sporoèila"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...to je kraj prve definicije"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "v msgstr je preveè oznak bli¾njic ,%c`"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "v glavi manjka polje ,%s`"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "polje ,%s` v glavi se mora zaèeti na zaèetku vrstice"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "nekatera polja v glavi imajo ¹e vedno zaèetne privzete vrednosti"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "polje ,%s' ima ¹e vedno zaèetno privzeto vrednost"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "opozorilo: starej¹e izdaje msgfmt bodo pri tem javile napako\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktiva ,domain %s` ni bila upo¹tevana"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "prazno polje ,msgstr` zavr¾eno"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "ohlapni vnos za polje ,msgstr` zavr¾en"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "izbire ,%c` ni moè uporabiti, preden sta izbrana bodisi ,K` bodisi ,T`"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Izvleèemo vsa sporoèila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
"pripadajo dani izvorni datoteki.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=DATOTEKA VZOREC preberemo iz navedene datoteke\n"
" -i, --ignore-case ne razlikujemo med velikimi in malimi èrkami\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output izhod abecedno urejen po sporoèilih\n"
" --sort-by-file izhod abecedno urejen po izvornih datotekah\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "pisanje podprocesu grep neuspe¹no"
msgid "English translations for %s package"
msgstr "Slovenski prevodi paketa %s"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "trenutno izbrani nabor \"%s\" ni prenosljivo ime kodnega nabora"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "v vhodni datoteki sta dva razlièna nabora znakov, \"%s\" in \"%s\""
"domena \"%s\" v vhodni datoteki ,%s` ne vsebuje glave z doloèitvijo nabora "
"znakov<"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
"Izhod ,%s` bo morda napaèen.\n"
"Mogoèa re¹itev za to te¾avo je, da nastavite LC_ALL=C.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "pretvorba neuspe¹na"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "v vhodni datoteki manjka glava z doloèilom kodnega nabora"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Pretvorba iz \"%s\" v \"%s\" ni mogoèa. %s klièe iconv(), ta pa ne podpira "
"te pretvorbe."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"doloèimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n"
"Privzet imenik s katalogom sporoèil: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<st. vhod>"
msgid "iconv failure"
msgstr "iconv neuspe¹en"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "napaka pri branju \"%s\""
msgid "standard output"
msgstr "standardni izhod"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: opozorilo: nezakljuèena znakovna konstanta"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: opozorilo: nezakljuèen niz"
msgid ""
msgstr ""
"Project-Id-Version: gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-12 14:54+0100\n"
"Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
msgid "error after reading \"%s\""
msgstr "fel efter \"%s\" lästes"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Okänt systemfel"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "antalet formateringsdirektiv i \"msgid\" och \"%s\" är olika"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
"formateringsdirektivet i \"msgid\" och \"%s\" för argument %u är inte "
"likadana"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"formateringsdirektiv för argument \"%u\", som i \"%s\", finns inte i \"msgid"
+"\""
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "formateringsdirektiv för argument %u finns inte i \"%s\""
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
msgstr ""
"formateringsdirektiv för argument {%u}, som i \"%s\", finns inte i \"msgid\""
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "formateringsdirektiv för argument {%u} finns inte i \"%s\""
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"formateringsdirektiv i \"msgid\" och \"%s\" för argument \"%s\" är inte "
"likadana"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "formateringsdirektiv för argument %u finns inte i \"%s\""
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"formateringsdirektiv för argument \"%u\", som i \"%s\", finns inte i \"msgid"
-"\""
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address adresser för värdnamnet\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "kunde inte hämta värdnamn"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "högst en infil tillåten"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s och %s är ömsesidigt uteslutande"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Användning: %s [FLAGGA] [INFIL]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Om ingen infil är given eller om den är - läses standard in.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[0] "%d allvarligt fel hittat"
msgstr[1] "%d allvarliga fel hittades"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "meddelandedefinitionen är dubblerad"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...detta är platsen för den första definitionen"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "huvudrad \"%s\" saknas i huvudet"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "huvudrad \"%s\" bör ligga i början på raden"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "vissa huvudrader har kvar initiala standardvärden"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "huvudrad \"%s\" har kvar initialt standardvärde"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr ""
"varning: konvertering till användarens teckenuppsättning kommer att "
"misslyckas.\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "varning: PO-filens huvudrader är luddiga\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "direktivet \"domain %s\" ignoreras"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "tom \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "luddig \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "flagga \"%c\" kan inte användas förrän \"K\" eller \"T\" angivits"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n"
"mönster eller hör till någon given källkodsfil.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=FIL hämta MÖNSTER från FIL\n"
" -i, --ignore-case versaler och gemener jämförs lika\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" --sort-output sortera resultatet\n"
" --sort-by-file sortera resultatet efter filposition\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "skrivning till grep barnprocess misslyckades"
msgid "English translations for %s package"
msgstr "Svenska översättningar för paket %s"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "nuvarande teckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen"
msgstr ""
"domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
"Resultatet för \"%s\" kan bli felaktigt.\n"
"Ett möjligt sätt att komma runt problemet är att sätta LC_ALL=C.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "konverteringsfel"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv()\n"
"och iconv() stöder inte denna konvertering."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"kan en annan katalog anges med miljövariabeln TEXTDOMAINDIR.\n"
"Normal katalog för meddelandekataloger: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<standard in>"
msgid "iconv failure"
msgstr "iconv misslyckades"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "fel uppstod då \"%s\" lästes"
msgid "standard output"
msgstr "standard ut"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: varning: oavslutad teckenkonstant"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: varning: oavslutad sträng"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.11-pre5\n"
-"POT-Creation-Date: 2002-01-11 15:48+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2002-01-14 02:21+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
msgid "error after reading \"%s\""
msgstr "\"%s\" okunduktan sonra hata"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "Bilinmeyen sistem hatası"
msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
-#: src/format-c.c:601 src/format-python.c:520
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
-#: src/format-elisp.c:349 src/format-java.c:660 src/format-librep.c:313
-#: src/format-pascal.c:403
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
+#, c-format
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr ""
+"'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
+
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok"
+
+#: src/format-java.c:660
#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in "
msgstr ""
"'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
-#: src/format-elisp.c:364 src/format-java.c:675 src/format-librep.c:328
-#: src/format-pascal.c:418
+#: src/format-java.c:675
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "{%u}.argüman için '%s' içinde bir biçem belirteci yok"
-#: src/format-elisp.c:389 src/format-java.c:700 src/format-librep.c:353
-#: src/format-pascal.c:443
+#: src/format-java.c:700
#, c-format
msgid ""
"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
-#: src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok"
-
-#: src/format-ycp.c:145
-#, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
-"'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
-
#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:279
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:284
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:374
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:460
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
" -i, --ip-address makinanın IP adresi\n"
#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:454
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
msgstr "makina ismi alınamadı"
#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:299 src/msginit.c:208 src/msguniq.c:227
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr "en fazla bir girdi dosyasına izin var"
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:363 src/msggrep.c:305 src/msggrep.c:309 src/msgmerge.c:295
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ile %s bağdaşmıyor"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:379 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:499 src/msggrep.c:390 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:395 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"Girdi dosyası verilmemişse ya da yerine - verilmişse standart girdi okunur.\n"
#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:403 src/msgmerge.c:425
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgstr[0] "%d ölümcül hata bulundu"
msgstr[1] "%d ölümcül hata bulundu"
-#: src/msgcmp.c:419 src/msgfmt.c:1359 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "ileti iki defa tanımlanmış"
-#: src/msgcmp.c:420 src/msgfmt.c:1360 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "...bu ilk tanımlamanın konumu"
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "çok fazla '%c' tuş kısayolu içeriyor"
-#: src/msgfmt.c:1200
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "başlıkta `%s' başlık alanı yok"
-#: src/msgfmt.c:1203
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "`%s' başlık alanı satırın başında olmalıydı"
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip"
-#: src/msgfmt.c:1223
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip"
-#: src/msgfmt.c:1264
+#: src/msgfmt.c:1269
msgid "warning: PO file header missing or invalid\n"
msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
-#: src/msgfmt.c:1267
+#: src/msgfmt.c:1272
msgid "warning: charset conversion will not work\n"
msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
-#: src/msgfmt.c:1277
+#: src/msgfmt.c:1282
msgid "warning: PO file header fuzzy\n"
msgstr "uyarı: PO dosya başlığı fuzzy\n"
-#: src/msgfmt.c:1279
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n"
-#: src/msgfmt.c:1304
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
-#: src/msgfmt.c:1309
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
-#: src/msgfmt.c:1320
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "`domain %s' yönergesi yoksayıldı"
-#: src/msgfmt.c:1392
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "boş `msgstr' girdisi yoksayıldı"
-#: src/msgfmt.c:1393
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "fuzzy `msgstr' girdisi yoksayıldı"
-#: src/msgfmt.c:1462
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
-#: src/msggrep.c:362
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr "'%c' seçeneği 'K' ya da 'T' belirtilmeden önce kullanılamaz"
-#: src/msggrep.c:384
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n"
"bir çeviri kataloğunun tüm iletilerini çıkarır.\n"
-#: src/msggrep.c:411
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -f, --file=DOSYA KALIP, DOSYAdan sağlanır\n"
" -i, --ignore-case harf büyüklükleri fark olarak algılanmaz\n"
-#: src/msggrep.c:439
+#: src/msggrep.c:452
#, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output çıktıyı sıralı üretir\n"
" -F, --sort-by-file çıktıyı dosya konumuna göre sıralar\n"
-#: src/msggrep.c:529
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr "grep alt sürecine yazılamadı"
msgid "English translations for %s package"
msgstr "%s paketi için Türkçe çeviriler"
-#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:300
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil"
-#: src/msgl-cat.c:182 src/msgl-iconv.c:308
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
"\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
"kümesi belirtilmemiş"
-#: src/msgl-cat.c:360 src/msgl-iconv.c:383
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
"'%s' çıktısı yanlış olabilir.\n"
"Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
-#: src/msgl-iconv.c:201 src/msgl-iconv.c:255
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr "dönüşüm başarısız"
-#: src/msgl-iconv.c:329
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş"
-#: src/msgl-iconv.c:347
+#: src/msgl-iconv.c:354
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
"ve iconv() bu dönüşümü desteklemiyor."
-#: src/msgl-iconv.c:363
+#: src/msgl-iconv.c:370
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n"
"Standart arama dizini: %s\n"
-#: src/open-po.c:59
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdÇ>"
msgid "iconv failure"
msgstr "iconv başarısızlığı"
-#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:286
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
-#: src/x-ycp.c:103
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "\"%s\" okunurken hata"
msgid "standard output"
msgstr "standart çıktı"
-#: src/x-c.c:935
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
-#: src/x-c.c:959
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
msgid ""
msgstr ""
"Project-Id-Version: GNU gettext 0.10.38\n"
-"POT-Creation-Date: 2001-11-30 14:18+0100\n"
+"POT-Creation-Date: 2002-01-31 15:34+0100\n"
"PO-Revision-Date: 2001-06-03 16:03 +0800\n"
"Last-Translator: Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>\n"
"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/argmatch.c:141
+#: lib/argmatch.c:134
#, c-format
msgid "invalid argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:142
+#: lib/argmatch.c:135
#, c-format
msgid "ambiguous argument `%s' for `%s'"
msgstr ""
-#: lib/argmatch.c:162
+#: lib/argmatch.c:155
msgid "Valid arguments are:"
msgstr ""
-#: lib/copy-file.c:60 src/file-list.c:57 src/po-lex.c:732 src/read-mo.c:170
-#: src/xgettext.c:729 src/xgettext.c:742 src/xgettext.c:752
+#: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:758 src/read-mo.c:171
+#: src/urlget.c:204 src/xgettext.c:805 src/xgettext.c:818 src/xgettext.c:828
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "·í¶}±ÒÀÉ®× \"%s\" ·Ç³ÆŪ¨ú®Éµo¥Í¿ù»~ "
-#: lib/copy-file.c:67
+#: lib/copy-file.c:68
#, fuzzy, c-format
msgid "cannot open backup file \"%s\" for writing"
msgstr "·í¶}±Ò \"%s\" ³oÓÀɮסA·Ç³Æ¼g¤Jªº®ÉÔµo¥Í¿ù»~"
-#: lib/copy-file.c:80
+#: lib/copy-file.c:81 src/urlget.c:216
#, fuzzy, c-format
msgid "error reading \"%s\""
msgstr "¥¿¦bŪ¨ú \"%s\" ªº®ÉÔ¸I¨ì¿ù»~"
-#: lib/copy-file.c:86 lib/copy-file.c:90
+#: lib/copy-file.c:87 lib/copy-file.c:91
#, fuzzy, c-format
msgid "error writing \"%s\""
msgstr "·í¼g¤J \"%s\" ³oÓÀɮ׮ɵo¥Í¿ù»~"
-#: lib/copy-file.c:92
+#: lib/copy-file.c:93 src/urlget.c:226
#, fuzzy, c-format
msgid "error after reading \"%s\""
msgstr "¥¿¦bŪ¨ú \"%s\" ªº®ÉÔ¸I¨ì¿ù»~"
-#: lib/error.c:115
+#: lib/error.c:116
msgid "Unknown system error"
msgstr "¤£©úªº¨t²Î¿ù»~"
-#: lib/execute.c:170 lib/execute.c:205 lib/pipe-bidi.c:156 lib/pipe-bidi.c:191
-#: lib/pipe-in.c:167 lib/pipe-in.c:202 lib/pipe-out.c:167 lib/pipe-out.c:202
-#: lib/wait-process.c:136
+#: lib/execute.c:169 lib/execute.c:204 lib/pipe-bidi.c:153 lib/pipe-bidi.c:188
+#: lib/pipe-in.c:168 lib/pipe-in.c:204 lib/pipe-out.c:168 lib/pipe-out.c:204
+#: lib/wait-process.c:132
#, c-format
msgid "%s subprocess failed"
msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: ¿ï¶µ `-W %s' ¨Ã¤£»Ýn°Ñ¼Æ \n"
-#: lib/javacomp.c:465
+#: lib/javacomp.c:440
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-#: lib/javaexec.c:404
+#: lib/javaexec.c:379
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-#: lib/obstack.c:474 lib/xerror.c:75 lib/xmalloc.c:56
+#: lib/obstack.c:474 lib/xerror.c:72 lib/xmalloc.c:53
msgid "memory exhausted"
msgstr "°O¾ÐÅé¯ÓºÉ"
-#: lib/pipe-bidi.c:119 lib/pipe-bidi.c:121 lib/pipe-in.c:136
-#: lib/pipe-out.c:136
+#: lib/pipe-bidi.c:116 lib/pipe-bidi.c:118 lib/pipe-in.c:135
+#: lib/pipe-out.c:135
#, fuzzy
msgid "cannot create pipe"
msgstr "¿é¥XÀÉ \"%s\" µLªk«Ø¥ß"
-#: lib/wait-process.c:117
+#: lib/wait-process.c:110
#, c-format
msgid "%s subprocess"
msgstr ""
-#: lib/wait-process.c:129
+#: lib/wait-process.c:124
#, c-format
-msgid "%s subprocess got fatal signal"
+msgid "%s subprocess got fatal signal %d"
msgstr ""
-#: src/format-c.c:578 src/format-python.c:463
-#, fuzzy
-msgid "number of format specifications in 'msgid' and 'msgstr' does not match"
+#: src/format-c.c:587 src/format-python.c:506
+#, fuzzy, c-format
+msgid "number of format specifications in 'msgid' and '%s' does not match"
msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
-#: src/format-c.c:588 src/format-python.c:473
+#: src/format-c.c:601 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument %u are not the "
-"same"
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-java.c:652 src/format-pascal.c:396
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgid'"
+msgid ""
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-java.c:662 src/format-pascal.c:406
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+msgid "a format specification for argument %u doesn't exist in '%s'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-java.c:676 src/format-pascal.c:420
+#: src/format-java.c:660
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument {%u} are not the "
-"same"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-lisp.c:3371
-#, fuzzy
-msgid "format specifications in 'msgid' and 'msgstr' are not equivalent"
-msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
+#: src/format-java.c:675
+#, fuzzy, c-format
+msgid "a format specification for argument {%u} doesn't exist in '%s'"
+msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-python.c:391
-#, fuzzy
+#: src/format-java.c:700
+#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' expect a mapping, those in 'msgstr' expect "
-"a tuple"
-msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-python.c:399
-#, fuzzy
-msgid ""
-"format specifications in 'msgid' expect a tuple, those in 'msgstr' expect a "
-"mapping"
+#: src/format-lisp.c:3381
+#, fuzzy, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
-#: src/format-python.c:422
+#: src/format-lisp.c:3402
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-python.c:432
+#: src/format-python.c:397
#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
+msgid ""
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
+msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
+
+#: src/format-python.c:409
+#, fuzzy, c-format
+msgid ""
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
+msgstr "¦b `msgid' ©M `msgstr' Äæ¦ì¸Ì«ü©wªº®æ¦¡¸¹½X¨Ã¤£²Å¦X"
-#: src/format-python.c:446
+#: src/format-python.c:437
#, fuzzy, c-format
msgid ""
-"format specifications in 'msgid' and 'msgstr' for argument '%s' are not the "
-"same"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-ycp.c:137
+#: src/format-python.c:452
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/format-ycp.c:138
+#: src/format-python.c:478
#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in 'msgid'"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
-#: src/gettext.c:146 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:134 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:171
-#: src/msgexec.c:240 src/msgfmt.c:333 src/msggrep.c:276 src/msginit.c:247
-#: src/msgmerge.c:252 src/msgunfmt.c:182 src/msguniq.c:207 src/ngettext.c:126
-#: src/xgettext.c:352
+#: src/gettext.c:135 src/hostname.c:168 src/msgattrib.c:264 src/msgcat.c:229
+#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
+#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:338 src/msggrep.c:278
+#: src/msginit.c:250 src/msgmerge.c:265 src/msgunfmt.c:182 src/msguniq.c:207
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:361
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
"³o¬O¦Û¥Ñ³nÅé; ½Ð°Ñ¦Òì©l½Xªºª©ÅvÁn©ú.\n"
"§Y¨Ï±z¬O¬°¤F¯S©wªº¥Øªº¦ÓÁʶR¤F¥»³nÅé, ¥»³nÅé¨ÌµM¤£´£¨Ñ¥ô¦ó«OÃÒ.\n"
-#: src/gettext.c:151 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:139 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:176
-#: src/msgexec.c:245 src/msgfmt.c:338 src/msggrep.c:281 src/msginit.c:252
-#: src/msgmerge.c:257 src/msgunfmt.c:187 src/msguniq.c:212 src/ngettext.c:131
-#: src/xgettext.c:357
+#: src/gettext.c:140 src/hostname.c:173 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
+#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:343 src/msggrep.c:283
+#: src/msginit.c:255 src/msgmerge.c:270 src/msgunfmt.c:187 src/msguniq.c:212
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:366
#, c-format
msgid "Written by %s.\n"
msgstr "¥Ñ %s ©Òòü¼g \n"
-#: src/gettext.c:169 src/hostname.c:183 src/msginit.c:262 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:183 src/msginit.c:265 src/ngettext.c:143
msgid "too many arguments"
msgstr "°Ñ¼Æ¤Ó¦h¤F"
-#: src/gettext.c:179 src/ngettext.c:155
+#: src/gettext.c:168 src/ngettext.c:155
msgid "missing arguments"
msgstr "¨S¦³°Ñ¼Æ"
-#: src/gettext.c:251 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:171 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:227
-#: src/msgexec.c:338 src/msgfmt.c:479 src/msggrep.c:371 src/msginit.c:338
-#: src/msgmerge.c:367 src/msgunfmt.c:262 src/msguniq.c:269 src/ngettext.c:210
-#: src/xgettext.c:499
+#: src/gettext.c:240 src/hostname.c:197 src/msgattrib.c:322 src/msgcat.c:290
+#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
+#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:484 src/msggrep.c:387
+#: src/msginit.c:341 src/msgmerge.c:380 src/msgunfmt.c:262 src/msguniq.c:269
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:508
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "¸Õ¸Õ¬Ý¥´ `%s --help' ¨ÓÀò±o§ó¦h¸ê°T \n"
-#: src/gettext.c:256
+#: src/gettext.c:245
#, c-format, no-wrap
msgid ""
"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
"or: %s [OPTION] -s [MSGID]...\n"
msgstr ""
-#: src/gettext.c:262
+#: src/gettext.c:251
#, no-wrap
msgid "Display native language translation of a textual message.\n"
msgstr ""
-#: src/gettext.c:266
+#: src/gettext.c:255
#, fuzzy, no-wrap
msgid ""
" -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
" [TEXTDOMAIN] MSGID ¥Ñ TEXTDOMAIN ³oÓ¤å¦r»â°ì¡A¨Ì¾Ú MSGID Ū¨ú½Ķ \n"
" «áªº°T®§¡C \n"
-#: src/gettext.c:277
+#: src/gettext.c:266
#, fuzzy, c-format, no-wrap
msgid ""
"If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
"¨ì¼Ð·Ç¿é¥X¡C \n"
"¥Ø«eªº¼Ð·Ç·j´M¸ô®|¬°: %s \n"
-#: src/gettext.c:288 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:216 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:287
-#: src/msgexec.c:410 src/msgfmt.c:563 src/msggrep.c:457 src/msginit.c:389
-#: src/msgmerge.c:465 src/msgunfmt.c:331 src/msguniq.c:343 src/ngettext.c:244
-#: src/xgettext.c:591
+#: src/gettext.c:277 src/hostname.c:227 src/msgattrib.c:402 src/msgcat.c:371
+#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
+#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:568 src/msggrep.c:473
+#: src/msginit.c:392 src/msgmerge.c:478 src/msgunfmt.c:331 src/msguniq.c:343
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:602
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "½Ð¦^³ø¿ù»~¦Ü <bug-gnu-utils@gnu.org>.\n"
-#: src/hostname.c:202 src/msginit.c:343
+#: src/hostname.c:202 src/msginit.c:346
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr ""
" -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:210 src/msgconv.c:299
-#: src/msgen.c:281 src/msgexec.c:404 src/msggrep.c:451 src/msginit.c:383
+#: src/hostname.c:221 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
+#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:467
+#: src/msginit.c:386 src/urlget.c:180
#, no-wrap
msgid ""
"Informative output:\n"
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:190 src/msggrep.c:296
-#: src/msginit.c:205 src/msguniq.c:227
+#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
+#: src/msggrep.c:298 src/msginit.c:208 src/msguniq.c:227
msgid "at most one input file allowed"
msgstr ""
#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:198 src/msgen.c:202 src/msgexec.c:260 src/msgexec.c:264
-#: src/msgfmt.c:358 src/msggrep.c:302 src/msggrep.c:306 src/msgmerge.c:282
-#: src/msgmerge.c:303 src/msgmerge.c:307 src/msguniq.c:233 src/msguniq.c:237
-#: src/xgettext.c:367 src/xgettext.c:371
+#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
+#: src/msgfmt.c:363 src/msggrep.c:304 src/msggrep.c:308 src/msgmerge.c:295
+#: src/msgmerge.c:316 src/msgmerge.c:320 src/msguniq.c:233 src/msguniq.c:237
+#: src/xgettext.c:376 src/xgettext.c:380
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s ©M %s ¨âªÌ¬O¤¬¤£¬Û®eªº"
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:376 src/msguniq.c:274
+#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:392 src/msguniq.c:274
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:191 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:245 src/msgexec.c:353 src/msgfmt.c:494
-#: src/msggrep.c:387 src/msginit.c:354 src/msgmerge.c:390 src/msgunfmt.c:277
-#: src/msguniq.c:291
+#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
+#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
+#: src/msgfmt.c:499 src/msggrep.c:403 src/msginit.c:357 src/msgmerge.c:403
+#: src/msgunfmt.c:277 src/msguniq.c:291
#, no-wrap
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:392 src/msguniq.c:296
+#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:408 src/msguniq.c:296
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:258 src/msgexec.c:366
-#: src/msggrep.c:400 src/msgmerge.c:412
+#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
+#: src/msggrep.c:416 src/msgmerge.c:425
#, no-wrap
msgid ""
"Output file location:\n"
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "¤£¥i¯àªº¿ï¾Ü (%d < n <%d) "
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:504
+#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:513
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
"PO file to define them. File positions from all PO files will be\n"
"preserved.\n"
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:520
+#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:529
#, no-wrap
msgid ""
"Input file location:\n"
" -V, --version Åã¥ÜÃö©óª©¥»ªº¸ê°T\n"
" -w, --width=NUMBER ³]©w¿é¥X¶¼e\n"
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:585
+#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:596
#, no-wrap
msgid ""
"Informative output:\n"
" -V, --version output version information and exit\n"
msgstr ""
-#: src/msgcmp.c:150 src/msgmerge.c:268
+#: src/msgcmp.c:149 src/msgmerge.c:281
msgid "no input files given"
msgstr "¥¼µ¹»P©Òn³B²zªºÀÉ®×"
-#: src/msgcmp.c:155 src/msgmerge.c:273
+#: src/msgcmp.c:154 src/msgmerge.c:286
msgid "exactly 2 input files required"
msgstr "¦¹¥\¯à»Ýn«ê¦n«ü©w¨âÓ¿é¤JÀÉ"
-#: src/msgcmp.c:176 src/msgmerge.c:372
+#: src/msgcmp.c:175 src/msgmerge.c:385
#, c-format, no-wrap
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
-#: src/msgcmp.c:181
+#: src/msgcmp.c:180
#, fuzzy, no-wrap
msgid ""
"Compare two Uniforum style .po files to check that both contain the same\n"
"¤ñ¸ûªº®ÉÔ¡A°²¦p§ä¤£¨ì§¹¥þ¤@PªºÄæ¦ì¡A¨º»òµ{¦¡·|¥Î¼Ò½kÅ޿誺¤èªk \n"
"¨Ó±o¨ì¤ñ¸û¦nªºÀˬdµ²ªG¡C\n"
-#: src/msgcmp.c:196
+#: src/msgcmp.c:195
#, no-wrap
msgid ""
"Input file location:\n"
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgcmp.c:204 src/msgmerge.c:436
+#: src/msgcmp.c:203 src/msgmerge.c:449
#, no-wrap
msgid ""
"Operation modifiers:\n"
" -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
-#: src/msgcmp.c:253 src/msgmerge.c:543
+#: src/msgcmp.c:252 src/msgmerge.c:848
msgid "this message is used but not defined..."
msgstr "³oÓ°T®§¦³³Q¨Ï¥Î¨ì¦ý¬O¨Ã¥¼³Q©w¸q¹L..."
-#: src/msgcmp.c:255 src/msgmerge.c:545
+#: src/msgcmp.c:254 src/msgmerge.c:850
msgid "...but this definition is similar"
msgstr "...¤£¹L³oÓ©w¸q¬Û¦ü"
-#: src/msgcmp.c:260 src/msgmerge.c:572
+#: src/msgcmp.c:259 src/msgmerge.c:877
#, c-format
msgid "this message is used but not defined in %s"
msgstr "¦b %s ¸Ì¨Ï¥Î¨ìªº°T®§¨Ã¥¼³Q©w¸q"
-#: src/msgcmp.c:332
+#: src/msgcmp.c:331
msgid "warning: this message is not used"
msgstr "ĵ§i¡G³oÓ°T®§¨S¦³³Q¥Î¨ì"
-#: src/msgcmp.c:339 src/po-lex.c:705
+#: src/msgcmp.c:338 src/po-lex.c:731
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "§ä¨ì¤F %d Ó«¤jªº¿ù»~"
-#: src/msgcmp.c:420 src/msgfmt.c:1323 src/read-po.c:202 src/x-po.c:163
+#: src/msgcmp.c:419 src/msgfmt.c:1364 src/read-po.c:202 src/x-po.c:163
msgid "duplicate message definition"
msgstr "«½Æªº°T®§©w¸q"
-#: src/msgcmp.c:421 src/msgfmt.c:1324 src/read-po.c:203 src/x-po.c:164
+#: src/msgcmp.c:420 src/msgfmt.c:1365 src/read-po.c:203 src/x-po.c:164
msgid "...this is the location of the first definition"
msgstr "... ³o¬O²Ä¤@¦¸©w¸qªº¦ì¸m"
"The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:284 src/msgen.c:266 src/msgmerge.c:442
+#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version Åã¥ÜÃö©óª©¥»ªº¸ê°T\n"
" -w, --width=NUMBER ³]©w¿é¥X¶¼e\n"
-#: src/msgen.c:187 src/msgfmt.c:349 src/xgettext.c:388
+#: src/msgen.c:186 src/msgfmt.c:354 src/xgettext.c:397
msgid "no input file given"
msgstr "¥¼µ¹»P©Òn³B²zªºÀÉ®×"
-#: src/msgen.c:192
+#: src/msgen.c:191
#, fuzzy
msgid "exactly one input file required"
msgstr "¦¹¥\¯à»Ýn«ê¦n«ü©w¨âÓ¿é¤JÀÉ"
-#: src/msgen.c:232
+#: src/msgen.c:231
#, c-format, no-wrap
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:237
+#: src/msgen.c:236
#, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
"identical to the msgid, and are marked fuzzy.\n"
msgstr ""
-#: src/msgen.c:250
+#: src/msgen.c:249
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:255
+#: src/msgexec.c:180
#, fuzzy
-msgid "missing filter name"
+msgid "missing command name"
msgstr "¨S¦³°Ñ¼Æ"
-#: src/msgexec.c:279
-#, fuzzy
-msgid "at least one sed script must be specified"
-msgstr "¥²¶·«ê¦n«ü©w¨âÓÀÉ®×"
-
-#: src/msgexec.c:343
+#: src/msgexec.c:228
#, c-format, no-wrap
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
msgstr ""
-#: src/msgexec.c:348
+#: src/msgexec.c:233
#, no-wrap
-msgid "Applies a filter to all translations of a translation catalog.\n"
+msgid ""
+"Applies a command to all translations of a translation catalog.\n"
+"The COMMAND can be any program that reads a translation from standard\n"
+"input. It is invoked once for each translation. Its output becomes\n"
+"msgexec's output. msgexec's return code is the maximum return code\n"
+"across all invocations.\n"
+msgstr ""
+
+#: src/msgexec.c:242
+#, no-wrap
+msgid ""
+"A special builtin command called '0' outputs the translation, followed by a\n"
+"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:358
+#: src/msgexec.c:253 src/msgfilter.c:366
#, no-wrap
msgid ""
"Input file location:\n"
"If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgexec.c:374
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr ""
+
+#: src/msgexec.c:337 src/msgfilter.c:603
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:263
+#, fuzzy
+msgid "missing filter name"
+msgstr "¨S¦³°Ñ¼Æ"
+
+#: src/msgfilter.c:287
+#, fuzzy
+msgid "at least one sed script must be specified"
+msgstr "¥²¶·«ê¦n«ü©w¨âÓÀÉ®×"
+
+#: src/msgfilter.c:351
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr ""
+
+#: src/msgfilter.c:356
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr ""
+
+#: src/msgfilter.c:382
#, no-wrap
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgexec.c:380
+#: src/msgfilter.c:388
#, no-wrap
msgid ""
"Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgexec.c:389
+#: src/msgfilter.c:397
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -E, --escape use C escapes in output, no extended chars\n"
" --force-po write PO file even if empty\n"
" --indent indented output style\n"
+" --keep-header keep header entry unmodified, don't filter it\n"
" --no-location suppress '#: filename:line' lines\n"
" --add-location preserve '#: filename:line' lines (default)\n"
" --strict strict Uniforum output style\n"
" -V, --version Åã¥ÜÃö©óª©¥»ªº¸ê°T\n"
" -w, --width=NUMBER ³]©w¿é¥X¶¼e\n"
-#: src/msgexec.c:546
+#: src/msgfilter.c:555
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-#: src/msgexec.c:574
+#: src/msgfilter.c:583
#, c-format
msgid "communication with %s subprocess failed"
msgstr ""
-#: src/msgexec.c:594
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: src/msgexec.c:625
+#: src/msgfilter.c:634
#, c-format
msgid "read from %s subprocess failed"
msgstr ""
-#: src/msgexec.c:641
+#: src/msgfilter.c:650
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr ""
-#: src/msgfmt.c:303
+#: src/msgfmt.c:308
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:364
+#: src/msgfmt.c:369
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:385 src/msgmerge.c:290
-#: src/msgmerge.c:296 src/msgunfmt.c:209 src/msgunfmt.c:215
+#: src/msgfmt.c:378 src/msgfmt.c:384 src/msgfmt.c:390 src/msgmerge.c:303
+#: src/msgmerge.c:309 src/msgunfmt.c:209 src/msgunfmt.c:215
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgfmt.c:452
+#: src/msgfmt.c:457
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d ¤w½Ķªº°T®§ "
-#: src/msgfmt.c:457
+#: src/msgfmt.c:462
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d Ӽҽk½Ķ"
-#: src/msgfmt.c:462
+#: src/msgfmt.c:467
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d Ó¥¼Ä¶ªº°T®§ "
-#: src/msgfmt.c:484
+#: src/msgfmt.c:489
#, c-format, no-wrap
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:489
+#: src/msgfmt.c:494
#, no-wrap
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:499
+#: src/msgfmt.c:504
#, no-wrap
msgid ""
"Input file location:\n"
"If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgfmt.c:507
+#: src/msgfmt.c:512
#, no-wrap
msgid ""
"Operation mode:\n"
" --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr ""
-#: src/msgfmt.c:514
+#: src/msgfmt.c:519
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:522
+#: src/msgfmt.c:527
#, no-wrap
msgid ""
"Output file location in Java mode:\n"
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:533
+#: src/msgfmt.c:538
#, no-wrap
msgid ""
"Input file interpretation:\n"
" -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:548
+#: src/msgfmt.c:553
#, c-format, no-wrap
msgid ""
"Output details:\n"
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:555
+#: src/msgfmt.c:560
#, no-wrap
msgid ""
"Informative output:\n"
" -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:720
msgid "plural expression can produce negative values"
msgstr ""
-#: src/msgfmt.c:720
+#: src/msgfmt.c:733
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-#: src/msgfmt.c:746
+#: src/msgfmt.c:759
msgid "plural expression can produce division by zero"
msgstr ""
-#: src/msgfmt.c:751
+#: src/msgfmt.c:764
msgid "plural expression can produce integer overflow"
msgstr ""
-#: src/msgfmt.c:756
+#: src/msgfmt.c:769
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-#: src/msgfmt.c:830 src/msgfmt.c:841
+#: src/msgfmt.c:843 src/msgfmt.c:854
msgid "message catalog has plural form translations..."
msgstr ""
-#: src/msgfmt.c:833
+#: src/msgfmt.c:846
msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
msgstr ""
-#: src/msgfmt.c:844
+#: src/msgfmt.c:857
msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-#: src/msgfmt.c:868
+#: src/msgfmt.c:881
#, fuzzy
msgid "invalid nplurals value"
msgstr "¤£¦Xªkªº±±¨î§Ç¦C"
-#: src/msgfmt.c:881
+#: src/msgfmt.c:894
msgid "invalid plural expression"
msgstr ""
-#: src/msgfmt.c:899 src/msgfmt.c:912
+#: src/msgfmt.c:912 src/msgfmt.c:927
#, c-format
msgid "nplurals = %lu..."
msgstr ""
-#: src/msgfmt.c:902
-#, c-format
-msgid "...but some messages have only %lu plural forms"
-msgstr ""
-
#: src/msgfmt.c:915
-#, c-format
-msgid "...but some messages have %lu plural forms"
-msgstr ""
+#, fuzzy, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "¦b %s ¸Ì¨Ï¥Î¨ìªº°T®§¨Ã¥¼³Q©w¸q"
#: src/msgfmt.c:930
+#, fuzzy, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "¦b %s ¸Ì¨Ï¥Î¨ìªº°T®§¨Ã¥¼³Q©w¸q"
+
+#: src/msgfmt.c:947
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-#: src/msgfmt.c:968
+#: src/msgfmt.c:985
msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
msgstr "`msgid' ©M `msgstr' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' ¶}©l"
-#: src/msgfmt.c:978
+#: src/msgfmt.c:995
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
msgstr "`msgid' ©M `msgstr[%u]' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' ¶}©l"
-#: src/msgfmt.c:990
+#: src/msgfmt.c:1007
msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
msgstr "`msgid' ©M `msgstr' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' ¶}©l"
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:1024
msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
msgstr "`msgid' ©M `msgid_plural' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' µ²§ô"
-#: src/msgfmt.c:1017
+#: src/msgfmt.c:1034
#, c-format
msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
msgstr "`msgid' ©M `msgstr[%u]' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' µ²§ô"
-#: src/msgfmt.c:1029
+#: src/msgfmt.c:1046
msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
msgstr "`msgid' ©M `msgstr' Äæ¦ì¨Ã¥¼¦P®É¥H '\\n' µ²§ô"
-#: src/msgfmt.c:1041
+#: src/msgfmt.c:1058
msgid "plural handling is a GNU gettext extension"
msgstr ""
-#: src/msgfmt.c:1088
+#: src/msgfmt.c:1123
#, c-format
-msgid "'msgstr' is not a valid %s format string, unlike 'msgid'"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
msgstr ""
-#: src/msgfmt.c:1122
+#: src/msgfmt.c:1158
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgfmt.c:1130
+#: src/msgfmt.c:1166
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgfmt.c:1164
+#: src/msgfmt.c:1201
#, c-format
msgid "headerfield `%s' missing in header"
msgstr "¯Ê¤Ö¼ÐÀYÄæ¦ì `%s'"
-#: src/msgfmt.c:1167
+#: src/msgfmt.c:1205
#, c-format
msgid "header field `%s' should start at beginning of line"
msgstr "¼ÐÀYÄæ¦ì `%s' À³¸Ó¦ì©ó¦æº"
-#: src/msgfmt.c:1176
+#: src/msgfmt.c:1216
msgid "some header fields still have the initial default value"
msgstr "¤@¨Ç¼ÐÀYÄæ¦ì¤´µM¬O¤º©wÈ"
-#: src/msgfmt.c:1187
+#: src/msgfmt.c:1228
#, c-format
msgid "field `%s' still has initial default value"
msgstr "¼ÐÀYÄæ¦ì `%s' ¤´µM¬O¤º©wÈ"
-#: src/msgfmt.c:1228
+#: src/msgfmt.c:1269
#, fuzzy
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: ĵ§i: PO ÀɼÐÀY¯Ê¥¢, ©Î¬O«Dªkªº, ©Î¬O¼Ò½kªº\n"
"%*s ĵ§i: ¦r¤¸¶°(charset)Âà´«±N¤£¹B§@"
-#: src/msgfmt.c:1231
+#: src/msgfmt.c:1272
#, fuzzy
msgid "warning: charset conversion will not work\n"
msgstr ""
"ÀÉÀY§ä¤£¨ì¦r¤¸¶°.\n"
"Âà´«°T®§¦Ü¨Ï¥ÎªÌ¦r¤¸¶°ªº¥\¯à±N¤£·|¹B§@\n"
-#: src/msgfmt.c:1241
+#: src/msgfmt.c:1282
#, fuzzy
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: ĵ§i: PO ÀɼÐÀY¯Ê¥¢, ©Î¬O«Dªkªº, ©Î¬O¼Ò½kªº\n"
"%*s ĵ§i: ¦r¤¸¶°(charset)Âà´«±N¤£¹B§@"
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1284
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:1268
+#: src/msgfmt.c:1309
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "»â°ì¦WºÙ \"%s\" ¤£¾A¦X°µ¬°ÀɮצWºÙ"
-#: src/msgfmt.c:1273
+#: src/msgfmt.c:1314
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "»â°ì¦WºÙ \"%s\" ¤£¾A¦X°µ¬°ÀɮצWºÙ¡G±N¨Ï¥Î¦rº"
-#: src/msgfmt.c:1284
+#: src/msgfmt.c:1325
#, c-format
msgid "`domain %s' directive ignored"
msgstr "©¿²¤ `domain %s' «ü¥O"
-#: src/msgfmt.c:1356
+#: src/msgfmt.c:1397
msgid "empty `msgstr' entry ignored"
msgstr "©¿²¤ªÅªº `msgstr' Äæ¦ì"
-#: src/msgfmt.c:1357
+#: src/msgfmt.c:1398
msgid "fuzzy `msgstr' entry ignored"
msgstr "©¿²¤¼Ò½k½Ķªº `msgstr' Äæ¦ì"
-#: src/msgfmt.c:1426
+#: src/msgfmt.c:1467
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ĵ§i: ì©lÀÉ¥]§t¼Ò½k½Ķ"
-#: src/msggrep.c:359
+#: src/msggrep.c:375
#, c-format
msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
msgstr ""
-#: src/msggrep.c:381
+#: src/msggrep.c:397
#, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:408
+#: src/msggrep.c:424
#, no-wrap
msgid ""
"Message selection:\n"
" -i, --ignore-case ignore case distinctions\n"
msgstr ""
-#: src/msggrep.c:436
+#: src/msggrep.c:452
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -V, --version Åã¥ÜÃö©óª©¥»ªº¸ê°T\n"
" -w, --width=NUMBER ³]©w¿é¥X¶¼e\n"
-#: src/msggrep.c:510
+#: src/msggrep.c:542
msgid "write to grep subprocess failed"
msgstr ""
-#: src/msginit.c:275
+#: src/msginit.c:278
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-#: src/msginit.c:303
+#: src/msginit.c:306
#, c-format
msgid ""
"Output file %s already exists.\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-#: src/msginit.c:326
+#: src/msginit.c:329
#, c-format
msgid "Created %s.\n"
msgstr ""
-#: src/msginit.c:348
+#: src/msginit.c:351
#, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-#: src/msginit.c:359
+#: src/msginit.c:362
#, no-wrap
msgid ""
"Input file location:\n"
"If it is -, standard input is read.\n"
msgstr ""
-#: src/msginit.c:367
+#: src/msginit.c:370
#, no-wrap
msgid ""
"Output file location:\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-#: src/msginit.c:375
+#: src/msginit.c:378
#, no-wrap
msgid ""
"Output details:\n"
" -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msginit.c:426
+#: src/msginit.c:429
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:434 src/msginit.c:439
+#: src/msginit.c:437 src/msginit.c:442
msgid "error reading current directory"
msgstr ""
-#: src/msginit.c:447
+#: src/msginit.c:450
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-#: src/msginit.c:887 src/msginit.c:932 src/msginit.c:1070 src/msginit.c:1137
+#: src/msginit.c:897 src/msginit.c:949 src/msginit.c:1087 src/msginit.c:1154
#: src/read-java.c:80
msgid "fdopen() failed"
msgstr ""
-#: src/msginit.c:892 src/msginit.c:937 src/msginit.c:1075
+#: src/msginit.c:902 src/msginit.c:954 src/msginit.c:1092
#, c-format
msgid "%s subprocess I/O error"
msgstr ""
-#: src/msginit.c:901 src/msginit.c:946 src/msginit.c:1084 src/msginit.c:1151
+#: src/msginit.c:911 src/msginit.c:963 src/msginit.c:1101 src/msginit.c:1168
#: src/read-java.c:90
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr ""
-#: src/msginit.c:1060
+#: src/msginit.c:1077
msgid ""
"The new message catalog should contain your email address, so that users "
"can\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1440
+#: src/msginit.c:1457
#, c-format
msgid "English translations for %s package"
msgstr ""
-#: src/msgl-cat.c:173 src/msgl-charset.c:86 src/msgl-iconv.c:299
+#: src/msgl-cat.c:174 src/msgl-charset.c:87 src/msgl-iconv.c:304
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-#: src/msgl-cat.c:181 src/msgl-iconv.c:307
+#: src/msgl-cat.c:182 src/msgl-iconv.c:314
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
-#: src/msgl-cat.c:194
+#: src/msgl-cat.c:195
#, c-format
msgid ""
"input file `%s' doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-cat.c:198
+#: src/msgl-cat.c:199
#, c-format
msgid ""
"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-#: src/msgl-cat.c:359 src/msgl-iconv.c:382
+#: src/msgl-cat.c:360 src/msgl-iconv.c:390
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-#: src/msgl-cat.c:409 src/msgl-cat.c:415 src/msgl-charset.c:91
-#: src/msgl-charset.c:126 src/write-po.c:723 src/write-po.c:817
+#: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
#, fuzzy
msgid "warning: "
msgstr "%s: ĵ§i: "
-#: src/msgl-cat.c:410
+#: src/msgl-cat.c:411
msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-#: src/msgl-cat.c:416
+#: src/msgl-cat.c:417
#, c-format
msgid ""
"Input files contain messages in different encodings, %s and %s among "
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-#: src/msgl-charset.c:92
+#: src/msgl-charset.c:93
#, c-format
msgid ""
"Locale charset \"%s\" is different from\n"
"Possible workarounds are:\n"
msgstr ""
-#: src/msgl-charset.c:99
+#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
msgstr ""
-#: src/msgl-charset.c:104
+#: src/msgl-charset.c:105
#, c-format
msgid ""
"- Convert the translation catalog to %s using 'msgconv',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:113
+#: src/msgl-charset.c:114
#, c-format
msgid ""
"- Set LC_ALL to a locale with encoding %s,\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-#: src/msgl-charset.c:127
+#: src/msgl-charset.c:128
#, c-format
msgid ""
"Locale charset \"%s\" is not a portable encoding name.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-#: src/msgl-iconv.c:200 src/msgl-iconv.c:254
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
msgid "conversion failure"
msgstr ""
-#: src/msgl-iconv.c:328
+#: src/msgl-iconv.c:336
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-#: src/msgl-iconv.c:346
+#: src/msgl-iconv.c:354
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"¤£¤ä´©¦r¤¸¶° \"%s\" %s ¨Ì¿à iconv() \n"
"¦Ó iconv() ¥Ø«e¤£¤ä´© \"%s\"\n"
-#: src/msgl-iconv.c:362
+#: src/msgl-iconv.c:370
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"¤£¤ä´©¦r¤¸¶° \"%s\" \n"
"%s ¨Ì¿à iconv(), ¦Ó¦¹ª©¥»¨S¦³¤º«Ø iconv().\n"
-#: src/msgmerge.c:340
+#: src/msgmerge.c:353
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:377
+#: src/msgmerge.c:390
#, fuzzy, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"¦¡·|¥Î¼Ò½kÅ޿誺¤èªk¨Ó±o¨ì¤ñ¸û¦nªºµ²ªG¡C \n"
"°£«D§A«ü©w¤@Ó¿é¥XÀɮסA§_«h¦X¨Öªºµ²ªG·|³Q°e¨ì¼Ð·Ç¿é¥X¥h¡C \n"
-#: src/msgmerge.c:395
+#: src/msgmerge.c:408
#, no-wrap
msgid ""
"Input file location:\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:405
+#: src/msgmerge.c:418
#, no-wrap
msgid ""
"Operation mode:\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:420
+#: src/msgmerge.c:433
#, no-wrap
msgid ""
"Output file location in update mode:\n"
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:457
+#: src/msgmerge.c:470
#, no-wrap
msgid ""
"Informative output:\n"
" -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:625
+#: src/msgmerge.c:930
#, fuzzy
msgid "this message should define plural forms"
msgstr "¦b %s ¸Ì¨Ï¥Î¨ìªº°T®§¨Ã¥¼³Q©w¸q"
-#: src/msgmerge.c:648
+#: src/msgmerge.c:953
#, fuzzy
msgid "this message should not define plural forms"
msgstr "¦b %s ¸Ì¨Ï¥Î¨ìªº°T®§¨Ã¥¼³Q©w¸q"
-#: src/msgmerge.c:779
+#: src/msgmerge.c:1084
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"%sŪ¤J %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
-#: src/msgmerge.c:787
+#: src/msgmerge.c:1092
msgid " done.\n"
msgstr " §¹¦¨.\n"
"TEXTDOMAINDIR «ü©w°T®§¸ê®ÆÀɪº©Ò¦bªº¦ì¸m¡C \n"
"¥Ø«eªº¼Ð·Ç·j´M¸ô®|¬°: %s \n"
-#: src/open-po.c:69
+#: src/open-po.c:60
msgid "<stdin>"
msgstr "<stdin>"
-#: src/po-charset.c:172 src/po-charset.c:240 src/po-charset.c:268
-#: src/po-charset.c:294
+#: src/po-charset.c:222 src/po-charset.c:280 src/po-charset.c:308
+#: src/po-charset.c:334
#, c-format
msgid "%s: warning: "
msgstr "%s: ĵ§i: "
-#: src/po-charset.c:173
+#: src/po-charset.c:223
#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"¦r¤¸¶° \"%s\" ªº½s½X¦W¤£¨ã¥iÄâ©Ê.\n"
"Âà´«°T®§¦Ü¨Ï¥ÎªÌ¦r¤¸¶°ªº¥\¯à±N¤£·|¹B§@\n"
-#: src/po-charset.c:236 src/po-charset.c:266
+#: src/po-charset.c:276 src/po-charset.c:306
msgid "Continuing anyway, expect parse errors."
msgstr "ÁaµM¾D¹J¿ù»~, ¤´Ä~Äò°õ¦æ"
-#: src/po-charset.c:238
+#: src/po-charset.c:278
msgid "Continuing anyway."
msgstr "Ä~Äò"
-#: src/po-charset.c:241
+#: src/po-charset.c:281
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"¤£¤ä´©¦r¤¸¶° \"%s\" %s ¨Ì¿à iconv() \n"
"¦Ó iconv() ¥Ø«e¤£¤ä´© \"%s\"\n"
-#: src/po-charset.c:250 src/po-charset.c:276
+#: src/po-charset.c:290 src/po-charset.c:316
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr "¥ý¦w¸Ë GNU libiconv, µM«á¦A¦w¸Ë GNU gettext, ±N·|×¥¿¦¹°ÝÃD\n"
-#: src/po-charset.c:255 src/po-charset.c:280
+#: src/po-charset.c:295 src/po-charset.c:320
#, c-format
msgid "%s\n"
msgstr "%s\n"
-#: src/po-charset.c:269
+#: src/po-charset.c:309
#, c-format
msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"¤£¤ä´©¦r¤¸¶° \"%s\" \n"
"%s ¨Ì¿à iconv(), ¦Ó¦¹ª©¥»¨S¦³¤º«Ø iconv().\n"
-#: src/po-charset.c:295
+#: src/po-charset.c:335
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
"ÀÉÀY§ä¤£¨ì¦r¤¸¶°.\n"
"Âà´«°T®§¦Ü¨Ï¥ÎªÌ¦r¤¸¶°ªº¥\¯à±N¤£·|¹B§@\n"
-#: po-gram-gen.y:91
+#: po-gram-gen.y:92
msgid "inconsistent use of #~"
msgstr "¤£¦X²zªº¨Ï¥Î #~"
-#: po-gram-gen.y:181
+#: po-gram-gen.y:182
msgid "missing `msgstr[]' section"
msgstr "§ä¤£¨ì `msgstr[]' ¬q¸¨"
-#: po-gram-gen.y:189
+#: po-gram-gen.y:190
msgid "missing `msgid_plural' section"
msgstr "§ä¤£¨ì `msgstr_plural' ¬q¸¨"
-#: po-gram-gen.y:196
+#: po-gram-gen.y:197
msgid "missing `msgstr' section"
msgstr "§ä¤£¨ì `msgstr' ¬q¸¨"
-#: po-gram-gen.y:241
+#: po-gram-gen.y:242
msgid "first plural form has nonzero index"
msgstr "²Ä¤@ӽƼƮ榡ªº«ü¼Ð¤£¬O0"
-#: po-gram-gen.y:243
+#: po-gram-gen.y:244
msgid "plural form has wrong index"
msgstr "½Æ¼Æ®æ¦¡µo²{¿ù»~ªº«ü¼Ð"
msgid "too many errors, aborting"
msgstr "¤Ó¦h¿ù»~¡A¤¤Â_¤£ª±¤F"
-#: src/po-lex.c:545 src/write-po.c:331 src/write-po.c:421
+#: src/po-lex.c:547 src/write-po.c:339 src/write-po.c:441
msgid "invalid multibyte sequence"
msgstr "«Dªkªº¦h¦r¤¸§Ç¦C (multibyte sequence)"
-#: src/po-lex.c:571
+#: src/po-lex.c:573
#, fuzzy
msgid "incomplete multibyte sequence at end of file"
msgstr "«Dªkªº¦h¦r¤¸§Ç¦C (multibyte sequence)"
-#: src/po-lex.c:581
+#: src/po-lex.c:583
#, fuzzy
msgid "incomplete multibyte sequence at end of line"
msgstr "«Dªkªº¦h¦r¤¸§Ç¦C (multibyte sequence)"
-#: src/po-lex.c:589
+#: src/po-lex.c:591
msgid "iconv failure"
msgstr ""
-#: src/po-lex.c:763 src/read-mo.c:70 src/read-mo.c:135 src/x-c.c:216
-#: src/x-rst.c:227 src/x-ycp.c:103
+#: src/po-lex.c:789 src/read-mo.c:71 src/read-mo.c:136 src/x-c.c:296
+#: src/x-elisp.c:172 src/x-librep.c:171 src/x-lisp.c:236 src/x-rst.c:227
+#: src/x-ycp.c:104
#, c-format
msgid "error while reading \"%s\""
msgstr "¥¿¦bŪ¨ú \"%s\" ªº®ÉÔ¸I¨ì¿ù»~"
-#: src/po-lex.c:829
+#: src/po-lex.c:855
#, c-format
msgid "keyword \"%s\" unknown"
msgstr "¤£©úªºÃöÁä¦r \"%s\""
-#: src/po-lex.c:939
+#: src/po-lex.c:965
msgid "invalid control sequence"
msgstr "¤£¦Xªkªº±±¨î§Ç¦C"
-#: src/po-lex.c:1047
+#: src/po-lex.c:1073
msgid "end-of-file within string"
msgstr "¦b¦r¦ê¤¤¶¡µo²{ÀÉ®×µ²§ô¦r¤¸ (EOF)"
-#: src/po-lex.c:1053
+#: src/po-lex.c:1079
msgid "end-of-line within string"
msgstr "¦b¦r¦ê¤¤¶¡µo²{¦æµ²§ô¦r¤¸ (end-of-line)"
-#: src/read-mo.c:71 src/read-mo.c:136
+#: src/read-mo.c:72 src/read-mo.c:137
#, c-format
msgid "file \"%s\" truncated"
msgstr "¤w¸g§âÀÉ®× \"%s\" ºIÂ_¤F"
-#: src/read-mo.c:102
+#: src/read-mo.c:103
#, c-format
msgid "seek \"%s\" offset %ld failed"
msgstr "§ä´M \"%s\" ¦b¦ì²¾ %ld ³B¥¢±Ñ"
-#: src/read-mo.c:141
+#: src/read-mo.c:142
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "©Òµ¹ªº³oÓÀÉ®× \"%s\" ¥]§t«D NUL µ²§Àªº¦r¦ê"
-#: src/read-mo.c:186
+#: src/read-mo.c:187
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "©Òµ¹ªº³oÓÀÉ®× \"%s\" ¨Ã«D GNU .mo ®æ¦¡ªºÀÉ®×"
-#: src/write-java.c:1108
+#: src/urlget.c:150
+#, fuzzy
+msgid "expected two arguments"
+msgstr "°Ñ¼Æ¤Ó¦h¤F"
+
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr ""
+
+#: src/urlget.c:174
+#, no-wrap
+msgid ""
+"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
+"the locally accessible FILE is used instead.\n"
+msgstr ""
+
+#: src/urlget.c:222
+#, fuzzy
+msgid "error writing stdout"
+msgstr "·í¼g¤J \"%s\" ³oÓÀɮ׮ɵo¥Í¿ù»~"
+
+#: src/write-java.c:1109
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
-#: src/write-java.c:1118
+#: src/write-java.c:1119
#, fuzzy, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "µLªk¦^¨ì \"%s\" ³oӥؿý"
-#: src/write-java.c:1131
+#: src/write-java.c:1132
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1188 src/write-java.c:1201
+#: src/write-java.c:1189 src/write-java.c:1202
#, c-format
msgid "failed to create \"%s\""
msgstr ""
-#: src/write-java.c:1209 src/write-mo.c:289 src/write-po.c:966
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
#, c-format
msgid "error while writing \"%s\" file"
msgstr "·í¼g¤J \"%s\" ³oÓÀɮ׮ɵo¥Í¿ù»~"
-#: src/write-java.c:1223
+#: src/write-java.c:1224
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "·í¶}±Ò \"%s\" ³oÓÀɮסA·Ç³Æ¼g¤Jªº®ÉÔµo¥Í¿ù»~"
-#: src/write-po.c:370
+#: src/write-po.c:390
#, c-format
msgid ""
"internationalized messages should not contain the `\\%c' escape sequence"
msgstr "n°ê»Ú¤Æªº°T®§¤£À³§t¦³ `\\%c' ³oÓ·¸¥X§Ç¦C¦r¤¸"
-#: src/write-po.c:724 src/write-po.c:818
+#: src/write-po.c:758 src/write-po.c:852
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
"%s\n"
msgstr ""
-#: src/write-po.c:885
+#: src/write-po.c:919
#, c-format
msgid "cannot create output file \"%s\""
msgstr "¿é¥XÀÉ \"%s\" µLªk«Ø¥ß"
-#: src/write-po.c:892
+#: src/write-po.c:926
#, no-c-format
msgid "standard output"
msgstr "¼Ð·Ç¿é¥X"
-#: src/x-c.c:858
+#: src/x-c.c:951
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ĵ§i: ¤£½T©wªº¦r¤¸±`¼Æ"
-#: src/x-c.c:882
+#: src/x-c.c:975
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ĵ§i: ¤£½T©wªº¦r¦ê¤å¦r"
-#: src/x-po.c:106 src/xgettext.c:605
+#: src/x-po.c:106 src/xgettext.c:616
msgid "this file may not contain domain directives"
msgstr "³oÓÀɮפ£¯à§t¦³»â°ì«ü¥O"
msgid "%s:%d: invalid string expression"
msgstr ""
-#: src/xgettext.c:375
+#: src/xgettext.c:384
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "·í¿é¥X³Q«¾É¦Ü stdout ®É, ¿ï¶µ --join-existing ¤£¯à¨Ï¥Î"
-#: src/xgettext.c:380
+#: src/xgettext.c:389
msgid "xgettext cannot work without keywords to look for"
msgstr "YµLÃöÁä¦r, xgettext ±NµLªk¹B§@"
-#: src/xgettext.c:468
+#: src/xgettext.c:477
#, c-format
msgid "warning: file `%s' extension `%s' is unknown; will try C"
msgstr "ĵ§i: ÀÉ®× `%s' ªº°ÆÀɦW `%s' ¥¼©ú ; °ÆÀɦW±N¨Ï¥Î C"
-#: src/xgettext.c:509
+#: src/xgettext.c:518
#, no-wrap
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:514
+#: src/xgettext.c:523
#, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/xgettext.c:529
+#: src/xgettext.c:538
#, no-wrap
msgid ""
"Output file location:\n"
"If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/xgettext.c:538
+#: src/xgettext.c:547
#, no-wrap
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
-#: src/xgettext.c:547
+#: src/xgettext.c:557
#, no-wrap
msgid ""
"Operation mode:\n"
" preceding keyword lines) in output file\n"
msgstr ""
-#: src/xgettext.c:556
+#: src/xgettext.c:566
#, no-wrap
msgid ""
"Language=C/C++ specific options:\n"
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:566
+#: src/xgettext.c:576
#, fuzzy, no-wrap
msgid ""
"Output details:\n"
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
" -V, --version Åã¥ÜÃö©óª©¥»ªº¸ê°T\n"
" -w, --width=NUMBER ³]©w¿é¥X¶¼e\n"
-#: src/xgettext.c:720
+#: src/xgettext.c:796
msgid "standard input"
msgstr "¼Ð·Ç¿é¤J"
-#: src/xgettext.c:830
+#: src/xgettext.c:911
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:1099
+#: src/xgettext.c:1209
#, c-format
msgid "language `%s' unknown"
msgstr "¥¼ª¾ªº»y¨¥ `%s'"
+#, fuzzy
+#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
+#~ msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
+
+#, fuzzy
+#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
+#~ msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
+
+#, fuzzy
+#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
+#~ msgstr "²Ä %lu ӰѼƫü©wªº®æ¦¡¨Ã¤£¬Û¦P"
+
#~ msgid "while creating hash table"
#~ msgstr "¥¿¦b«Ø¥ßÂø´êªí®É"
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
AUTOMAKE_OPTIONS = 1.2 gnits
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
JAR = @JAR@
YACC = @YACC@ -d
bin_PROGRAMS = gettext ngettext \
msgcmp msgfmt msgmerge msgunfmt xgettext \
-msgattrib msgcat msgcomm msgconv msgen msgexec msggrep msginit msguniq
+msgattrib msgcat msgcomm msgconv msgen msgexec msgfilter msggrep msginit msguniq
noinst_PROGRAMS = hostname urlget
po-gram-gen.h po-hash-gen.h msgl-charset.h msgl-equal.h msgl-iconv.h \
msgl-ascii.h msgl-cat.h msgl-english.h msgfmt.h msgunfmt.h read-mo.h \
write-mo.h read-java.h write-java.h po-time.h format.h xgettext.h x-c.h \
-x-po.h x-java.h x-ycp.h x-rst.h
+x-po.h x-lisp.h x-elisp.h x-librep.h x-java.h x-ycp.h x-rst.h
EXTRA_DIST = FILES project-id \
DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
-DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libgettextlib.la @INTLLIBS@
+LDADD = ../lib/libgettextlib.la @LTLIBINTL@
SED = sed
JAVACOMP = $(SHELL) ../lib/javacomp.sh
# xgettext and msgfmt deal with format strings.
FORMAT_SOURCE = format.c \
-format-c.c format-java.c format-lisp.c format-python.c format-pascal.c \
-format-ycp.c
+format-c.c format-java.c format-lisp.c format-elisp.c format-librep.c \
+format-python.c format-pascal.c format-ycp.c
# libgettextsrc contains all code that is needed by at least two programs.
msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c plural-eval.c
msgmerge_SOURCES = msgmerge.c
msgunfmt_SOURCES = msgunfmt.c read-mo.c read-java.c
-xgettext_SOURCES = xgettext.c x-c.c x-po.c x-java.l x-ycp.c x-rst.c
+xgettext_SOURCES = xgettext.c \
+ x-c.c x-po.c x-lisp.c x-elisp.c x-librep.c x-java.l x-ycp.c x-rst.c
+
msgattrib_SOURCES = msgattrib.c
msgcat_SOURCES = msgcat.c
msgcomm_SOURCES = msgcomm.c
msgconv_SOURCES = msgconv.c
msgen_SOURCES = msgen.c
msgexec_SOURCES = msgexec.c
+msgfilter_SOURCES = msgfilter.c
msggrep_SOURCES = msggrep.c
msginit_SOURCES = msginit.c
msguniq_SOURCES = msguniq.c
# How to build libgettextsrc.la.
# Need ../lib/libgettextlib.la.
-# Need @INTLLIBS@ because many source files use gettext().
-# Need @LIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c use
-# iconv().
+# Need @LTLIBINTL@ because many source files use gettext().
+# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# use iconv().
libgettextsrc_la_LDFLAGS = \
-release @VERSION@ \
- ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ -no-undefined
+ ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
# Link dependencies.
+gettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
+ngettext_LDADD = ../lib/basename.lo ../lib/error.lo ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo ../lib/xmalloc.lo @LTLIBINTL@
msgcmp_LDADD = libgettextsrc.la
msgfmt_LDADD = libgettextsrc.la
msgmerge_LDADD = libgettextsrc.la
msgconv_LDADD = libgettextsrc.la
msgen_LDADD = libgettextsrc.la
msgexec_LDADD = libgettextsrc.la
+msgfilter_LDADD = libgettextsrc.la
msggrep_LDADD = libgettextsrc.la
msginit_LDADD = ../intl/localealias.$(OBJEXT) ../intl/localename.$(OBJEXT) \
libgettextsrc.la
read-po.lo write-po.lo msgl-ascii.lo msgl-iconv.lo \
msgl-equal.lo msgl-cat.lo msgl-english.lo file-list.lo \
msgl-charset.lo po-time.lo plural.lo format.lo format-c.lo \
- format-java.lo format-lisp.lo format-python.lo format-pascal.lo \
- format-ycp.lo
+ format-java.lo format-lisp.lo format-elisp.lo format-librep.lo \
+ format-python.lo format-pascal.lo format-ycp.lo
libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
bin_PROGRAMS = gettext$(EXEEXT) ngettext$(EXEEXT) msgcmp$(EXEEXT) \
msgfmt$(EXEEXT) msgmerge$(EXEEXT) msgunfmt$(EXEEXT) \
xgettext$(EXEEXT) msgattrib$(EXEEXT) msgcat$(EXEEXT) \
msgcomm$(EXEEXT) msgconv$(EXEEXT) msgen$(EXEEXT) \
- msgexec$(EXEEXT) msggrep$(EXEEXT) msginit$(EXEEXT) \
- msguniq$(EXEEXT)
+ msgexec$(EXEEXT) msgfilter$(EXEEXT) msggrep$(EXEEXT) \
+ msginit$(EXEEXT) msguniq$(EXEEXT)
noinst_PROGRAMS = hostname$(EXEEXT) urlget$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_gettext_OBJECTS = gettext.$(OBJEXT)
gettext_OBJECTS = $(am_gettext_OBJECTS)
-gettext_LDADD = $(LDADD)
-gettext_DEPENDENCIES = ../lib/libgettextlib.la
+gettext_DEPENDENCIES = ../lib/basename.lo ../lib/error.lo \
+ ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo \
+ ../lib/xmalloc.lo
gettext_LDFLAGS =
am_hostname_OBJECTS = hostname.$(OBJEXT)
hostname_OBJECTS = $(am_hostname_OBJECTS)
msgexec_OBJECTS = $(am_msgexec_OBJECTS)
msgexec_DEPENDENCIES = libgettextsrc.la
msgexec_LDFLAGS =
+am_msgfilter_OBJECTS = msgfilter.$(OBJEXT)
+msgfilter_OBJECTS = $(am_msgfilter_OBJECTS)
+msgfilter_DEPENDENCIES = libgettextsrc.la
+msgfilter_LDFLAGS =
am_msgfmt_OBJECTS = msgfmt.$(OBJEXT) write-mo.$(OBJEXT) \
write-java.$(OBJEXT) plural-eval.$(OBJEXT)
msgfmt_OBJECTS = $(am_msgfmt_OBJECTS)
msguniq_LDFLAGS =
am_ngettext_OBJECTS = ngettext.$(OBJEXT)
ngettext_OBJECTS = $(am_ngettext_OBJECTS)
-ngettext_LDADD = $(LDADD)
-ngettext_DEPENDENCIES = ../lib/libgettextlib.la
+ngettext_DEPENDENCIES = ../lib/basename.lo ../lib/error.lo \
+ ../lib/getopt.lo ../lib/getopt1.lo ../lib/strtoul.lo \
+ ../lib/xmalloc.lo
ngettext_LDFLAGS =
am_urlget_OBJECTS = urlget.$(OBJEXT)
urlget_OBJECTS = $(am_urlget_OBJECTS)
urlget_DEPENDENCIES = ../lib/libgettextlib.la
urlget_LDFLAGS =
am_xgettext_OBJECTS = xgettext.$(OBJEXT) x-c.$(OBJEXT) x-po.$(OBJEXT) \
+ x-lisp.$(OBJEXT) x-elisp.$(OBJEXT) x-librep.$(OBJEXT) \
x-java.$(OBJEXT) x-ycp.$(OBJEXT) x-rst.$(OBJEXT)
xgettext_OBJECTS = $(am_xgettext_OBJECTS)
xgettext_DEPENDENCIES = libgettextsrc.la
DIST_SOURCES = $(libgettextsrc_la_SOURCES) $(gettext_SOURCES) \
$(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) \
$(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) \
- $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) \
- $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) \
- $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) \
- $(urlget_SOURCES) $(xgettext_SOURCES)
+ $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfilter_SOURCES) \
+ $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) \
+ $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) \
+ $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in \
po-gram-gen.c po-hash-gen.c user-email.in x-java.c
-SOURCES = $(libgettextsrc_la_SOURCES) $(gettext_SOURCES) $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES)
+SOURCES = $(libgettextsrc_la_SOURCES) $(gettext_SOURCES) $(hostname_SOURCES) $(msgattrib_SOURCES) $(msgcat_SOURCES) $(msgcmp_SOURCES) $(msgcomm_SOURCES) $(msgconv_SOURCES) $(msgen_SOURCES) $(msgexec_SOURCES) $(msgfilter_SOURCES) $(msgfmt_SOURCES) $(msggrep_SOURCES) $(msginit_SOURCES) $(msgmerge_SOURCES) $(msgunfmt_SOURCES) $(msguniq_SOURCES) $(ngettext_SOURCES) $(urlget_SOURCES) $(xgettext_SOURCES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
msgexec$(EXEEXT): $(msgexec_OBJECTS) $(msgexec_DEPENDENCIES)
@rm -f msgexec$(EXEEXT)
$(LINK) $(msgexec_LDFLAGS) $(msgexec_OBJECTS) $(msgexec_LDADD) $(LIBS)
+msgfilter$(EXEEXT): $(msgfilter_OBJECTS) $(msgfilter_DEPENDENCIES)
+ @rm -f msgfilter$(EXEEXT)
+ $(LINK) $(msgfilter_LDFLAGS) $(msgfilter_OBJECTS) $(msgfilter_LDADD) $(LIBS)
msgfmt$(EXEEXT): $(msgfmt_OBJECTS) $(msgfmt_DEPENDENCIES)
@rm -f msgfmt$(EXEEXT)
$(LINK) $(msgfmt_LDFLAGS) $(msgfmt_OBJECTS) $(msgfmt_LDADD) $(LIBS)
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "str-list.h"
#include "po-lex.h"
#include "error.h"
#include "xmalloc.h"
-#include "libgettext.h"
+#include "gettext.h"
#include "po.h"
#define _(str) gettext (str)
po_gram_error_at_line (&(value2).pos, _("inconsistent use of #~"));
-#line 106 "po-gram-gen.y"
+#line 107 "po-gram-gen.y"
typedef union
{
struct { char *string; lex_pos_ty pos; bool obsolete; } string;
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 126, 127, 128, 129, 130, 134, 141, 159, 177, 185,
- 193, 202, 213, 217, 232, 254, 261, 272
+ 127, 128, 129, 130, 131, 135, 142, 160, 178, 186,
+ 194, 203, 214, 218, 233, 255, 262, 273
};
#endif
0, 11, 15
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
#endif
#endif
\f
-#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
switch (yyn) {
case 6:
-#line 135 "po-gram-gen.y"
+#line 136 "po-gram-gen.y"
{
po_callback_domain (yyvsp[0].string.string);
;
break;}
case 7:
-#line 142 "po-gram-gen.y"
+#line 143 "po-gram-gen.y"
{
char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist);
char *string4 = string_list_concat_destroy (&yyvsp[0].stringlist.stringlist);
;
break;}
case 8:
-#line 160 "po-gram-gen.y"
+#line 161 "po-gram-gen.y"
{
char *string2 = string_list_concat_destroy (&yyvsp[-2].stringlist.stringlist);
;
break;}
case 9:
-#line 178 "po-gram-gen.y"
+#line 179 "po-gram-gen.y"
{
check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist);
check_obsolete (yyvsp[-2].pos, yyvsp[0].string);
;
break;}
case 10:
-#line 186 "po-gram-gen.y"
+#line 187 "po-gram-gen.y"
{
check_obsolete (yyvsp[-2].pos, yyvsp[-1].stringlist);
check_obsolete (yyvsp[-2].pos, yyvsp[0].rhs);
;
break;}
case 11:
-#line 194 "po-gram-gen.y"
+#line 195 "po-gram-gen.y"
{
check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist);
po_gram_error_at_line (&yyvsp[-1].pos.pos, _("missing `msgstr' section"));
;
break;}
case 12:
-#line 203 "po-gram-gen.y"
+#line 204 "po-gram-gen.y"
{
check_obsolete (yyvsp[-1].pos, yyvsp[0].stringlist);
plural_counter = 0;
;
break;}
case 13:
-#line 214 "po-gram-gen.y"
+#line 215 "po-gram-gen.y"
{
yyval.rhs = yyvsp[0].rhs;
;
break;}
case 14:
-#line 218 "po-gram-gen.y"
+#line 219 "po-gram-gen.y"
{
check_obsolete (yyvsp[-1].rhs, yyvsp[0].rhs);
yyval.rhs.rhs.msgstr = (char *) xmalloc (yyvsp[-1].rhs.rhs.msgstr_len + yyvsp[0].rhs.rhs.msgstr_len);
;
break;}
case 15:
-#line 233 "po-gram-gen.y"
+#line 234 "po-gram-gen.y"
{
check_obsolete (yyvsp[-4].pos, yyvsp[-3].pos);
check_obsolete (yyvsp[-4].pos, yyvsp[-2].number);
;
break;}
case 16:
-#line 255 "po-gram-gen.y"
+#line 256 "po-gram-gen.y"
{
string_list_init (&yyval.stringlist.stringlist);
string_list_append (&yyval.stringlist.stringlist, yyvsp[0].string.string);
;
break;}
case 17:
-#line 262 "po-gram-gen.y"
+#line 263 "po-gram-gen.y"
{
check_obsolete (yyvsp[-1].stringlist, yyvsp[0].string);
yyval.stringlist.stringlist = yyvsp[-1].stringlist.stringlist;
;
break;}
case 18:
-#line 273 "po-gram-gen.y"
+#line 274 "po-gram-gen.y"
{
po_callback_comment (yyvsp[0].string.string);
;
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
return 1;
}
-#line 277 "po-gram-gen.y"
+#line 278 "po-gram-gen.y"
#line 20 "po-hash-gen.y"
+/* 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
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "xmalloc.h"
#include "po.h"
#define yycheck po_hash_yycheck
-#line 92 "po-hash-gen.y"
+#line 101 "po-hash-gen.y"
typedef union
{
char *string;
size_t number;
} YYSTYPE;
-#line 101 "po-hash-gen.y"
+#line 110 "po-hash-gen.y"
static const char *cur;
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 132, 133, 137, 143, 149, 155, 161
+ 141, 142, 146, 152, 158, 164, 170
};
#endif
8, 4, 0, 5, 4
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
#endif
#endif
\f
-#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
switch (yyn) {
case 3:
-#line 138 "po-hash-gen.y"
+#line 147 "po-hash-gen.y"
{
/* GNU style */
po_callback_comment_filepos (yyvsp[-2].string, yyvsp[0].number);
;
break;}
case 4:
-#line 144 "po-hash-gen.y"
+#line 153 "po-hash-gen.y"
{
/* GNU style, without line number (e.g. from Pascal .rst) */
po_callback_comment_filepos (yyvsp[0].string, (size_t)(-1));
;
break;}
case 5:
-#line 150 "po-hash-gen.y"
+#line 159 "po-hash-gen.y"
{
/* SunOS style */
po_callback_comment_filepos (yyvsp[-4].string, yyvsp[0].number);
;
break;}
case 6:
-#line 156 "po-hash-gen.y"
+#line 165 "po-hash-gen.y"
{
/* Solaris style */
po_callback_comment_filepos (yyvsp[-5].string, yyvsp[0].number);
;
break;}
case 7:
-#line 162 "po-hash-gen.y"
+#line 171 "po-hash-gen.y"
{
/* GNU style, but STRING is `file'. Esoteric, but it
happened. */
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
return 1;
}
-#line 169 "po-hash-gen.y"
+#line 178 "po-hash-gen.y"
#line 1 "./x-java.l"
#define INITIAL 0
/* xgettext Java backend. -*- C -*-
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002 Free Software Foundation, Inc.
Written by Tommy Johansson <tommy.johansson@kanalen.org>, 2001.
This program is free software; you can redistribute it and/or modify
JAVA_STRING,
JAVA_OPERATOR,
JAVA_FLOW,
- JAVA_COMMENT,
+ JAVA_COMMENT
} TOKEN_TYPE;
typedef struct
STATE_WORD,
STATE_APPEND,
STATE_INVOCATION,
- STATE_KEYWORD,
+ STATE_KEYWORD
} PARSER_STATE;
typedef struct
static char *get_string PARAMS ((char_buf *b));
static void destroy_charbuf PARAMS ((char_buf *b));
static void update_line_no PARAMS ((int c));
+static void strip_ending_spaces PARAMS ((char *str));
static char *append_strings PARAMS ((char *a, char *b));
static inline bool isplus PARAMS ((char *s));
static inline bool isdot PARAMS ((char *s));
static char *translate_esc PARAMS ((char *s));
+static object_list * object_list_alloc PARAMS ((void));
+static void object_list_destroy PARAMS ((object_list *list));
+static int get_num_objects PARAMS ((const object_list *list));
+static void * get_object PARAMS ((const object_list *list, int i));
+static void add_object PARAMS ((object_list *list, void *object));
+static java_keyword * alloc_keyword PARAMS ((const char *keyword,
+ int arg1, int arg2));
+static bool tailcmp PARAMS ((const char *s1, const char *s2));
static bool do_compare PARAMS ((const char *s1, const char *s2));
static java_keyword *is_keyword PARAMS ((const char *s));
static void free_global PARAMS ((void));
{
int len = strlen (str);
- while (isspace (str[len--]))
- ;
+ while (len > 0 && isspace ((unsigned char) str[len - 1]))
+ len--;
str[len] = '\0';
}
-#line 581 "x-java.c-tmp"
+#line 590 "x-java.c-tmp"
/* Macros after this point can all be overridden by user definitions in
* section 1.
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 177 "./x-java.l"
+#line 186 "./x-java.l"
-#line 735 "x-java.c-tmp"
+#line 744 "x-java.c-tmp"
if ( yy_init )
{
case 1:
YY_RULE_SETUP
-#line 179 "./x-java.l"
+#line 188 "./x-java.l"
{
int c;
int last;
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 202 "./x-java.l"
+#line 211 "./x-java.l"
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 203 "./x-java.l"
+#line 212 "./x-java.l"
{
int c;
char *str;
char_buf *charbuf = create_char_buf ();
- while ((c = input ()) != '"')
+ while ((c = input ()) != EOF && c != '"')
{
update_line_no (c);
append_char_buf (charbuf, c);
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 218 "./x-java.l"
+#line 227 "./x-java.l"
{
parser_global->word = yytext;
return JAVA_WORD;
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 223 "./x-java.l"
+#line 232 "./x-java.l"
{
parser_global->flow = yytext;
return JAVA_FLOW;
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 228 "./x-java.l"
+#line 237 "./x-java.l"
{
parser_global->operator = yytext;
return JAVA_OPERATOR;
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 233 "./x-java.l"
+#line 242 "./x-java.l"
/* ignore whitespace */
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 235 "./x-java.l"
+#line 244 "./x-java.l"
{
parser_global->comment = xstrdup (yytext + 2);
return JAVA_COMMENT;
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 239 "./x-java.l"
+#line 248 "./x-java.l"
parser_global->line_no++;
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 240 "./x-java.l"
+#line 249 "./x-java.l"
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 241 "./x-java.l"
+#line 250 "./x-java.l"
YY_BREAK
case YY_STATE_EOF(INITIAL):
-#line 242 "./x-java.l"
+#line 251 "./x-java.l"
return -1;
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 243 "./x-java.l"
+#line 252 "./x-java.l"
ECHO;
YY_BREAK
-#line 928 "x-java.c-tmp"
+#line 937 "x-java.c-tmp"
case YY_END_OF_BUFFER:
{
return 0;
}
#endif
-#line 243 "./x-java.l"
+#line 252 "./x-java.l"
static char *
char *s;
{
char *n = (char *) xmalloc (strlen (s) + 1);
- int i;
- int j = 0;
+ size_t i;
+ size_t j = 0;
for (i = 0; i < strlen (s); i++)
switch (s[i])
}
-
static java_keyword *
alloc_keyword (keyword, arg1, arg2)
const char *keyword;
/**
- * Extract the keyword from a keyword indata string.
- */
-static char *
-extract_keyword (key)
- const char *key;
-{
- char *s = strchr (key, ':');
- char *new_string;
-
- new_string = xstrdup (key);
- if (s != NULL)
- new_string[s - key] = '\0';
- return new_string;
-}
-
-/**
- * Extract the msgid arg number from a keyword indata string.
+ * Backwards substring match.
*/
-static int
-extract_msgid_arg (key)
- const char *key;
-{
- char *s = strchr (key, ':');
- int arg;
-
- if (s != NULL)
- {
- s ++;
- arg = strtol (s, &s, 10);
- }
- else
- {
- arg = 1;
- }
- return arg;
-}
-
-/**
- * Extract the msgid plural arg number from a keyword indata string,
- * if any.
- */
-static int
-extract_msgid_plural_arg (key)
- const char *key;
+static bool
+tailcmp (s1, s2)
+ const char *s1;
+ const char *s2;
{
- char *s = strchr (key, ',');
- int arg;
- if (s != NULL)
- {
- s ++;
- arg = strtol (s, &s, 10);
- }
- else
- {
- arg = 0;
- }
- return arg;
+ int len1 = strlen (s1);
+ int len2 = strlen (s2);
+ int start = len1 - len2;
+ if (start < 0)
+ return false;
+ return (start == 0 || s1[start-1] == '.') && (strcmp (s1 + start, s2) == 0);
}
-
/**
* Try to match a string against the keyword. If substring_match is
* true substring match is used.
if (substring_match)
return strstr (s1, s2) != NULL;
else
- return strcmp (s1, s2) == 0;
+ return tailcmp (s1, s2);
}
/**
x_java_keyword (keyword)
const char *keyword;
{
+ const char *keyword_end;
int arg1;
int arg2;
+ size_t len;
char *kw;
if (keyword == NULL)
}
if (java_keywords == NULL)
+ java_keywords = object_list_alloc ();
+
+ split_keywordspec (keyword, &keyword_end, &arg1, &arg2);
+ len = keyword_end - keyword;
+ kw = (char *) xmalloc (len + 1);
+ memcpy (kw, keyword, len);
+ kw[len] = '\0';
+
+ /* kw should be a valid Java identifier sequence with dots.
+ A colon means an invalid parse in split_keywordspec(). */
+ if (strchr (kw, ':') == NULL)
{
- java_keywords = object_list_alloc ();
+ if (arg1 == 0)
+ arg1 = 1;
+ add_object (java_keywords, alloc_keyword (kw, arg1, arg2));
}
-
- kw = extract_keyword (keyword);
- arg1 = extract_msgid_arg (keyword);
- arg2 = extract_msgid_plural_arg (keyword);
- add_object (java_keywords, alloc_keyword (kw, arg1, arg2));
}
int token;
PARSER_STATE state = STATE_NONE;
PARSER_STATE last_state = STATE_NONE;
- char *str;
- char *key;
- message_ty *plural;
+ char *str = NULL; /* used only if state == STATE_STRING
+ || state == STATE_APPEND */
+ char *key = NULL; /* used only if state == STATE_WORD
+ || state == STATE_INVOCATION */
+ message_ty *plural = NULL; /* used only after state was STATE_KEYWORD */
message_list_ty *mlp = mdlp->item[0]->messages;
java_keyword *current_keyword = NULL;
java_keyword *keyword;
if (java_keywords == NULL)
{
/* ops, no standard keywords */
- x_java_keyword ("gettext"); /* GettextResource.gettext */
- x_java_keyword ("ngettext:1,2"); /* GettextResource.ngettext */
+ x_java_keyword ("GettextResource.gettext:2"); /* static method */
+ x_java_keyword ("GettextResource.ngettext:2,3"); /* static method */
+ x_java_keyword ("gettext");
+ x_java_keyword ("ngettext:1,2");
x_java_keyword ("getString"); /* ResourceBundle.getString */
}
k2 = append_strings (key, ".");
free (key);
key = append_strings (k2, parser_global->word);
- state = STATE_NONE;
+ free (k2);
}
else
{
+ if (str != NULL)
+ {
+ free (str);
+ str = NULL;
+ }
state = STATE_WORD;
key = xstrdup (parser_global->word);
}
free (key);
state = STATE_KEYWORD;
argument_counter = 1;
+ plural = NULL;
}
break;
case JAVA_STRING:
if (state == STATE_KEYWORD)
- {
- last_state = STATE_KEYWORD;
- }
+ last_state = STATE_KEYWORD;
if (state == STATE_APPEND)
{
char *s2;
s2 = append_strings (str, translate_esc (parser_global->string));
free (str);
str = s2;
- state = STATE_STRING;
}
else
- {
- state = STATE_STRING;
- str = translate_esc (parser_global->string);
- }
+ str = translate_esc (parser_global->string);
+ state = STATE_STRING;
break;
case JAVA_OPERATOR:
if (state == STATE_STRING && isplus (parser_global->operator))
- {
- state = STATE_APPEND;
- }
+ state = STATE_APPEND;
else
{
+ if (str != NULL)
+ {
+ free (str);
+ str = NULL;
+ }
state = STATE_NONE;
}
break;
{
remember_a_message (mlp, str, &pos);
}
- else if (!extract_all_strings
- && argument_counter == current_keyword->msgid_arg)
+ else if (argument_counter == current_keyword->msgid_arg)
{
plural = remember_a_message (mlp, str, &pos);
if (current_keyword->msgid_plural_arg == 0)
}
}
- else if (!extract_all_strings &&
- argument_counter == current_keyword->msgid_plural_arg)
+ else if (argument_counter == current_keyword->msgid_plural_arg
+ && str != NULL)
{
remember_a_message_plural (plural, str, &pos);
state = STATE_NONE;
last_state = STATE_NONE;
argument_counter = 0;
}
+ else
+ {
+ if (str != NULL)
+ free (str);
+ }
+ str = NULL;
}
if (extract_all_strings)
{
- state = STATE_NONE;
- last_state = STATE_NONE;
+ if (str != NULL)
+ {
+ free (str);
+ str = NULL;
+ }
+ state = STATE_NONE;
+ last_state = STATE_NONE;
}
if (state == STATE_WORD && isdot (parser_global->flow))
break;
case JAVA_COMMENT:
+ if (str != NULL)
+ {
+ free (str);
+ str = NULL;
+ }
state = STATE_NONE;
last_state = STATE_NONE;
xgettext_comment_add (parser_global->comment);
break;
default:
+ if (str != NULL)
+ {
+ free (str);
+ str = NULL;
+ }
state = STATE_NONE;
}
free_global ();
}
while (token != -1);
+
+ if (str != NULL)
+ free (str);
}
ECHO = @ECHO@
EMACS = @EMACS@
EXEEXT = @EXEEXT@
+GCC = @GCC@
GENCAT = @GENCAT@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
HAVE_JRE_IN_PATH = @HAVE_JRE_IN_PATH@
HAVE_JVIEW = @HAVE_JVIEW@
HAVE_JVIEW_IN_PATH = @HAVE_JVIEW_IN_PATH@
+HAVE_LIB = @HAVE_LIB@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
JAR = @JAR@
JAVA = @JAVA@
JAVAC = @JAVAC@
+LD = @LD@
LEX = @LEX@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIB = @LIB@
LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTALLOCA = @LTALLOCA@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
am__quote = @am__quote@
install_sh = @install_sh@
lispdir = @lispdir@
+with_gnu_ld = @with_gnu_ld@
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
msgcomm-8 msgcomm-9 msgcomm-10 msgcomm-11 msgcomm-12 msgcomm-13 \
msgcomm-14 msgcomm-15 msgcomm-16 msgcomm-17 msgcomm-18 msgcomm-19 \
msgcomm-20 msgcomm-21 msgcomm-22 msgcomm-23 \
- msgconv-1 msgconv-2 \
+ msgconv-1 msgconv-2 msgconv-3 \
msgen-1 \
msgexec-1 msgexec-2 \
msgfilter-1 msgfilter-2 \
xgettext-7 xgettext-8 xgettext-9 xgettext-10 xgettext-11 xgettext-12 \
xgettext-13 xgettext-14 xgettext-15 xgettext-16 xgettext-17 \
format-c-1 format-c-2 \
+ format-elisp-1 format-elisp-2 \
format-java-1 format-java-2 \
format-librep-1 format-librep-2 \
format-lisp-1 format-lisp-2 \
format-pascal-1 format-pascal-2 \
format-ycp-1 format-ycp-2 \
plural-1 plural-2 \
- lang-c lang-c++ lang-objc lang-clisp lang-librep lang-java lang-pascal lang-ycp lang-po lang-rst
+ lang-c lang-c++ lang-objc lang-clisp lang-elisp lang-librep lang-java lang-pascal lang-ycp lang-po lang-rst \
+ rpath-1a rpath-1b \
+ rpath-2aaa rpath-2aab rpath-2aac rpath-2aad \
+ rpath-2aba rpath-2abb rpath-2abc rpath-2abd \
+ rpath-2baa rpath-2bab rpath-2bac rpath-2bad \
+ rpath-2bba rpath-2bbb rpath-2bbc rpath-2bbd
+
+
+EXTRA_DIST = $(TESTS) \
+ test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.out \
+ rpathx/configure.in rpathx/aclocal.m4 rpathx/configure \
+ rpathx/Makefile.am rpathx/Makefile.in rpathx/rpathx.c \
+ rpathy/configure.in rpathy/aclocal.m4 rpathy/configure \
+ rpathy/Makefile.am rpathy/Makefile.in rpathy/rpathy.c \
+ rpathlx/configure.in rpathlx/aclocal.m4 rpathlx/configure \
+ rpathlx/Makefile.am rpathlx/Makefile.in rpathlx/usex.c \
+ rpathly/configure.in rpathly/aclocal.m4 rpathly/configure \
+ rpathly/Makefile.am rpathly/Makefile.in rpathly/usey.c \
+ rpathlyx/configure.in rpathlyx/aclocal.m4 rpathlyx/configure \
+ rpathlyx/Makefile.am rpathlyx/Makefile.in rpathlyx/usey.c \
+ rpath-1 rpath-2_a rpath-2_b rpath-2.README rpathcfg.sh
-EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.out
-
XGETTEXT = ../src/xgettext
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
CC='@CC@' CFLAGS='@CFLAGS@' \
CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
- INTLLIBS='@INTLLIBS@' \
+ LTLIBINTL='@LTLIBINTL@' \
TESTJAVA='@TESTJAVA@' \
+ CONFIG_SHELL='$(SHELL)' \
$(SHELL)
-# Two auxiliary programs used by the tests.
+# Three auxiliary programs used by the tests.
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
LDADD_yes = ../intl/libintl.la
-LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
+LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@
noinst_PROGRAMS = tstgettext tstngettext cake
tstgettext_SOURCES = tstgettext.c setlocale.c
tstgettext_LDADD = ../lib/libgettextlib.la $(LDADD)
tstngettext_SOURCES = tstngettext.c setlocale.c
tstngettext_LDADD = ../lib/libgettextlib.la $(LDADD)
cake_SOURCES = plural-1-prg.c setlocale.c
+cake_LDADD = ../lib/libgettextlib.la $(LDADD)
+MOSTLYCLEANFILES = rpathcfg rpathcfg.log
subdir = tests
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
am_cake_OBJECTS = plural-1-prg.$(OBJEXT) setlocale.$(OBJEXT)
cake_OBJECTS = $(am_cake_OBJECTS)
-cake_LDADD = $(LDADD)
-cake_DEPENDENCIES =
+cake_DEPENDENCIES = ../lib/libgettextlib.la
cake_LDFLAGS =
am_tstgettext_OBJECTS = tstgettext.$(OBJEXT) setlocale.$(OBJEXT)
tstgettext_OBJECTS = $(am_tstgettext_OBJECTS)
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
+ $(mkinstalldirs) $(distdir)/rpathlx $(distdir)/rpathly $(distdir)/rpathlyx $(distdir)/rpathx $(distdir)/rpathy
@for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
-k_ --omit-header --no-location \
$(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
$(top_srcdir)/src/gettext.c
+
+# Help maintaining config.rpath.
+rpathcfg: rpathcfg.sh
+ top_srcdir=$(top_srcdir) \
+ CONFIG_SHELL='$(SHELL)' \
+ CC='@CC@' GCC='@GCC@' \
+ LDFLAGS='@LDFLAGS@' \
+ LD='@LD@' with_gnu_ld='@with_gnu_ld@' \
+ host='@host@' \
+ $(SHELL) $(srcdir)/rpathcfg.sh > rpathcfg 2> rpathcfg.log
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} variable and augments the CPPFLAGS
-dnl variable.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
AC_DEFUN([AC_LIB_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
AC_LIB_LINKFLAGS_BODY([$1], [$2])
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
])
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
dnl results of this search when this library appears as a dependency.
HAVE_LIB[]NAME=yes
dnl searches for libname and the libraries corresponding to explicit and
dnl implicit dependencies, together with the specified include files and
dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} variable
-dnl and augments the CPPFLAGS variable, and #defines HAVE_LIB${NAME} to 1.
-dnl Otherwise, it sets and AC_SUBSTs HAVE_LIB${NAME}=no and LIB${NAME} to
-dnl empty.
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl Search for lib[]Name and define LIB[]NAME and INC[]NAME accordingly.
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
AC_LIB_LINKFLAGS_BODY([$1], [$2])
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
dnl $INC[]NAME either.
CPPFLAGS="$ac_save_CPPFLAGS"
LIB[]NAME=
+ LTLIB[]NAME=
fi
AC_SUBST([HAVE_LIB]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
undefine([Name])
undefine([NAME])
])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the INC${NAME} and LIB${NAME} variables.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
dnl Search the library and its dependencies in $additional_libdir and
dnl $LDFLAGS. Using breadth-first-seach.
LIB[]NAME=
+ LTLIB[]NAME=
INC[]NAME=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='$1 $2'
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
- AC_LIB_APPENDTOVAR(LIB[]NAME, [$value])
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
else
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
dnl that this library doesn't exist. So just drop it.
fi
else
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME.
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
found_dir=
found_la=
found_so=
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIB[]NAME; do
+ for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
case "$x" in
-L*)
fi
if test "X$found_dir" != "X"; then
dnl Found the library.
- dnl Most of the following complexities is not needed when libtool
- dnl is used.
- ifdef([AC_PROG_][LIBTOOL], [], [
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- dnl FIXME: Which systems does this affect?
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- ])
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- ifdef([AC_PROG_][LIBTOOL], [], [
- fi
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
fi
- ])
+ fi
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
dnl Potentially add $additional_includedir to $INCNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS or the already
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
dnl constructed $INCNAME,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
dnl Really add $additional_includedir to $INCNAME.
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME.
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS or the already
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
dnl constructed $LIBNAME,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
dnl Really add $additional_libdir to $LIBNAME.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
*)
dnl Most likely an immediate library name.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
;;
esac
done
dnl directories known to the linker should also be known to the
dnl runtime loader, otherwise the system is severely misconfigured.)
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
])
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
AC_DEFUN([AC_LIB_APPENDTOVAR],
[
for element in [$2]; do
fi
LIBRPATHX=
+ LTLIBRPATHX=
INCRPATHX=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='rpathx '
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
-
- for element in $value; do
- haveit=
- for x in $LIBRPATHX; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$element"
- fi
- done
-
+ test -z "$value" || LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$value"
else
:
fi
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIBRPATHX; do
+ for x in $LDFLAGS $LTLIBRPATHX; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
done
fi
if test "X$found_dir" != "X"; then
-
- if test "X$found_so" != "X"; then
- if test "X$found_dir" = "X/usr/lib"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
fi
- else
- haveit=
- for x in $LDFLAGS $LIBRPATHX; do
-
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- else
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
- else
-
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
-
- fi
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
fi
-
+ fi
additional_includedir=
case "$found_dir" in
*/lib | */lib/)
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INCRPATHX; do
-
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
INCRPATHX="${INCRPATHX}${INCRPATHX:+ }-I$additional_includedir"
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIBRPATHX; do
-
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIBRPATHX; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
;;
*)
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$dep"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$dep"
;;
esac
done
fi
else
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-R$found_dir"
+ done
+ fi
ac_cv_librpathx_libs="$LIBRPATHX"
+ ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
ac_cv_librpathx_cppflags="$INCRPATHX"
fi
echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
LIBRPATHX="$ac_cv_librpathx_libs"
+ LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
INCRPATHX="$ac_cv_librpathx_cppflags"
for element in $INCRPATHX; do
done
+
HAVE_LIBRPATHX=yes
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@LIBRPATHX@%$LIBRPATHX%g
+s%@LTLIBRPATHX@%$LTLIBRPATHX%g
s%@global_top_srcdir@%$global_top_srcdir%g
CEOF
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} variable and augments the CPPFLAGS
-dnl variable.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
AC_DEFUN([AC_LIB_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
AC_LIB_LINKFLAGS_BODY([$1], [$2])
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
])
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
dnl results of this search when this library appears as a dependency.
HAVE_LIB[]NAME=yes
dnl searches for libname and the libraries corresponding to explicit and
dnl implicit dependencies, together with the specified include files and
dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} variable
-dnl and augments the CPPFLAGS variable, and #defines HAVE_LIB${NAME} to 1.
-dnl Otherwise, it sets and AC_SUBSTs HAVE_LIB${NAME}=no and LIB${NAME} to
-dnl empty.
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl Search for lib[]Name and define LIB[]NAME and INC[]NAME accordingly.
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
AC_LIB_LINKFLAGS_BODY([$1], [$2])
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
dnl $INC[]NAME either.
CPPFLAGS="$ac_save_CPPFLAGS"
LIB[]NAME=
+ LTLIB[]NAME=
fi
AC_SUBST([HAVE_LIB]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
undefine([Name])
undefine([NAME])
])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the INC${NAME} and LIB${NAME} variables.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
dnl Search the library and its dependencies in $additional_libdir and
dnl $LDFLAGS. Using breadth-first-seach.
LIB[]NAME=
+ LTLIB[]NAME=
INC[]NAME=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='$1 $2'
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
- AC_LIB_APPENDTOVAR(LIB[]NAME, [$value])
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
else
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
dnl that this library doesn't exist. So just drop it.
fi
else
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME.
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
found_dir=
found_la=
found_so=
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIB[]NAME; do
+ for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
case "$x" in
-L*)
fi
if test "X$found_dir" != "X"; then
dnl Found the library.
- dnl Most of the following complexities is not needed when libtool
- dnl is used.
- ifdef([AC_PROG_][LIBTOOL], [], [
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- dnl FIXME: Which systems does this affect?
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- ])
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- ifdef([AC_PROG_][LIBTOOL], [], [
- fi
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
fi
- ])
+ fi
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
dnl Potentially add $additional_includedir to $INCNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS or the already
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
dnl constructed $INCNAME,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
dnl Really add $additional_includedir to $INCNAME.
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME.
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS or the already
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
dnl constructed $LIBNAME,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
dnl Really add $additional_libdir to $LIBNAME.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
*)
dnl Most likely an immediate library name.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
;;
esac
done
dnl directories known to the linker should also be known to the
dnl runtime loader, otherwise the system is severely misconfigured.)
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
])
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
AC_DEFUN([AC_LIB_APPENDTOVAR],
[
for element in [$2]; do
fi
LIBRPATHY=
+ LTLIBRPATHY=
INCRPATHY=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='rpathy '
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
-
- for element in $value; do
- haveit=
- for x in $LIBRPATHY; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$element"
- fi
- done
-
+ test -z "$value" || LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }$value"
else
:
fi
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIBRPATHY; do
+ for x in $LDFLAGS $LTLIBRPATHY; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
done
fi
if test "X$found_dir" != "X"; then
-
- if test "X$found_so" != "X"; then
- if test "X$found_dir" = "X/usr/lib"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
fi
- else
- haveit=
- for x in $LDFLAGS $LIBRPATHY; do
-
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- else
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ else
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_a"
- else
-
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir -l$name"
-
- fi
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir -l$name"
fi
-
+ fi
additional_includedir=
case "$found_dir" in
*/lib | */lib/)
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INCRPATHY; do
-
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
INCRPATHY="${INCRPATHY}${INCRPATHY:+ }-I$additional_includedir"
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIBRPATHY; do
-
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIBRPATHY; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
;;
*)
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$dep"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }$dep"
;;
esac
done
fi
else
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-R$found_dir"
+ done
+ fi
ac_cv_librpathy_libs="$LIBRPATHY"
+ ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
ac_cv_librpathy_cppflags="$INCRPATHY"
fi
echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
LIBRPATHY="$ac_cv_librpathy_libs"
+ LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
INCRPATHY="$ac_cv_librpathy_cppflags"
for element in $INCRPATHY; do
done
+
HAVE_LIBRPATHY=yes
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@LIBRPATHY@%$LIBRPATHY%g
+s%@LTLIBRPATHY@%$LTLIBRPATHY%g
s%@global_top_srcdir@%$global_top_srcdir%g
CEOF
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AMTAR = @AMTAR@
+AWK = @AWK@
CC = @CC@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
+HAVE_LIB = @HAVE_LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIB = @LIB@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
global_top_srcdir = @global_top_srcdir@
+install_sh = @install_sh@
AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
usey_SOURCES = usey.c
LDADD = @LIBRPATHY@
subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_CLEAN_FILES =
bin_PROGRAMS = usey$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
DIST_SOURCES = $(usey_SOURCES)
-DIST_COMMON = ../../install-sh ../../missing ../../mkinstalldirs \
- Makefile.am Makefile.in configure configure.in
+DIST_COMMON = ../../config.guess ../../config.sub ../../install-sh \
+ ../../missing ../../mkinstalldirs Makefile.am Makefile.in \
+ aclocal.m4 configure configure.in
SOURCES = $(usey_SOURCES)
all: all-am
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} variable and augments the CPPFLAGS
-dnl variable.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
AC_DEFUN([AC_LIB_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
AC_LIB_LINKFLAGS_BODY([$1], [$2])
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
])
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
dnl results of this search when this library appears as a dependency.
HAVE_LIB[]NAME=yes
dnl searches for libname and the libraries corresponding to explicit and
dnl implicit dependencies, together with the specified include files and
dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} variable
-dnl and augments the CPPFLAGS variable, and #defines HAVE_LIB${NAME} to 1.
-dnl Otherwise, it sets and AC_SUBSTs HAVE_LIB${NAME}=no and LIB${NAME} to
-dnl empty.
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl Search for lib[]Name and define LIB[]NAME and INC[]NAME accordingly.
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
AC_LIB_LINKFLAGS_BODY([$1], [$2])
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
dnl $INC[]NAME either.
CPPFLAGS="$ac_save_CPPFLAGS"
LIB[]NAME=
+ LTLIB[]NAME=
fi
AC_SUBST([HAVE_LIB]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
undefine([Name])
undefine([NAME])
])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the INC${NAME} and LIB${NAME} variables.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
dnl Search the library and its dependencies in $additional_libdir and
dnl $LDFLAGS. Using breadth-first-seach.
LIB[]NAME=
+ LTLIB[]NAME=
INC[]NAME=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='$1 $2'
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
- AC_LIB_APPENDTOVAR(LIB[]NAME, [$value])
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
else
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
dnl that this library doesn't exist. So just drop it.
fi
else
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME.
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
found_dir=
found_la=
found_so=
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIB[]NAME; do
+ for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
case "$x" in
-L*)
fi
if test "X$found_dir" != "X"; then
dnl Found the library.
- dnl Most of the following complexities is not needed when libtool
- dnl is used.
- ifdef([AC_PROG_][LIBTOOL], [], [
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- dnl FIXME: Which systems does this affect?
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- ])
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- ifdef([AC_PROG_][LIBTOOL], [], [
- fi
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
fi
- ])
+ fi
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
dnl Potentially add $additional_includedir to $INCNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS or the already
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
dnl constructed $INCNAME,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
dnl Really add $additional_includedir to $INCNAME.
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME.
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS or the already
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
dnl constructed $LIBNAME,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
dnl Really add $additional_libdir to $LIBNAME.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
*)
dnl Most likely an immediate library name.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
;;
esac
done
dnl directories known to the linker should also be known to the
dnl runtime loader, otherwise the system is severely misconfigured.)
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
])
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
AC_DEFUN([AC_LIB_APPENDTOVAR],
[
for element in [$2]; do
fi
LIBRPATHX=
+ LTLIBRPATHX=
INCRPATHX=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='rpathx '
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
-
- for element in $value; do
- haveit=
- for x in $LIBRPATHX; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$element"
- fi
- done
-
+ test -z "$value" || LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$value"
else
:
fi
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIBRPATHX; do
+ for x in $LDFLAGS $LTLIBRPATHX; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
done
fi
if test "X$found_dir" != "X"; then
-
- if test "X$found_so" != "X"; then
- if test "X$found_dir" = "X/usr/lib"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
fi
- else
- haveit=
- for x in $LDFLAGS $LIBRPATHX; do
-
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
- else
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
- else
-
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
-
- fi
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
fi
-
+ fi
additional_includedir=
case "$found_dir" in
*/lib | */lib/)
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INCRPATHX; do
-
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
INCRPATHX="${INCRPATHX}${INCRPATHX:+ }-I$additional_includedir"
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIBRPATHX; do
-
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIBRPATHX; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
;;
*)
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$dep"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$dep"
;;
esac
done
fi
else
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-R$found_dir"
+ done
+ fi
ac_cv_librpathx_libs="$LIBRPATHX"
+ ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
ac_cv_librpathx_cppflags="$INCRPATHX"
fi
echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
LIBRPATHX="$ac_cv_librpathx_libs"
+ LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
INCRPATHX="$ac_cv_librpathx_cppflags"
for element in $INCRPATHX; do
done
+
HAVE_LIBRPATHX=yes
echo $ac_n "checking how to link with librpathy""... $ac_c" 1>&6
-echo "configure:1724: checking how to link with librpathy" >&5
+echo "configure:1745: checking how to link with librpathy" >&5
if eval "test \"`echo '$''{'ac_cv_librpathy_libs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
LIBRPATHY=
+ LTLIBRPATHY=
INCRPATHY=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='rpathy rpathx'
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
-
- for element in $value; do
- haveit=
- for x in $LIBRPATHY; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$element"
- fi
- done
-
+ test -z "$value" || LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }$value"
else
:
fi
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIBRPATHY; do
+ for x in $LDFLAGS $LTLIBRPATHY; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
done
fi
if test "X$found_dir" != "X"; then
-
- if test "X$found_so" != "X"; then
- if test "X$found_dir" = "X/usr/lib"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
fi
- else
- haveit=
- for x in $LDFLAGS $LIBRPATHY; do
-
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
- else
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_so"
+ else
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$found_a"
- else
-
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir -l$name"
-
- fi
+ LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$found_dir -l$name"
fi
-
+ fi
additional_includedir=
case "$found_dir" in
*/lib | */lib/)
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INCRPATHY; do
-
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
INCRPATHY="${INCRPATHY}${INCRPATHY:+ }-I$additional_includedir"
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIBRPATHY; do
-
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBRPATHY; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIBRPATHY; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
;;
*)
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$dep"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }$dep"
;;
esac
done
fi
else
LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }-l$name"
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBRPATHY="${LTLIBRPATHY}${LTLIBRPATHY:+ }-R$found_dir"
+ done
+ fi
ac_cv_librpathy_libs="$LIBRPATHY"
+ ac_cv_librpathy_ltlibs="$LTLIBRPATHY"
ac_cv_librpathy_cppflags="$INCRPATHY"
fi
echo "$ac_t""$ac_cv_librpathy_libs" 1>&6
LIBRPATHY="$ac_cv_librpathy_libs"
+ LTLIBRPATHY="$ac_cv_librpathy_ltlibs"
INCRPATHY="$ac_cv_librpathy_cppflags"
for element in $INCRPATHY; do
done
+
HAVE_LIBRPATHY=yes
-
- for element in $LIBRPATHX; do
- haveit=
- for x in $LIBRPATHY; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHY="${LIBRPATHY}${LIBRPATHY:+ }$element"
- fi
- done
-
+LIBRPATHY="$LIBRPATHY $LIBRPATHX"
trap '' 1 2 15
cat > confcache <<\EOF
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@LIBRPATHX@%$LIBRPATHX%g
+s%@LTLIBRPATHX@%$LTLIBRPATHX%g
s%@LIBRPATHY@%$LIBRPATHY%g
+s%@LTLIBRPATHY@%$LTLIBRPATHY%g
s%@global_top_srcdir@%$global_top_srcdir%g
CEOF
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+AMTAR = @AMTAR@
+AS = @AS@
+AWK = @AWK@
CC = @CC@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+HAVE_LIB = @HAVE_LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIB = @LIB@
LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
global_top_srcdir = @global_top_srcdir@
+install_sh = @install_sh@
AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies
mkinstalldirs = $(SHELL) @global_top_srcdir@/mkinstalldirs
lib_LTLIBRARIES = librpathy.la
librpathy_la_SOURCES = rpathy.c
-librpathy_la_LDFLAGS = @LIBRPATHX@ -lc -no-undefined
+librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined
subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DIST_SOURCES = $(librpathy_la_SOURCES)
DIST_COMMON = ../../config.guess ../../config.sub ../../install-sh \
../../ltmain.sh ../../missing ../../mkinstalldirs Makefile.am \
- Makefile.in configure configure.in
+ Makefile.in aclocal.m4 configure configure.in
SOURCES = $(librpathy_la_SOURCES)
all: all-am
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+
+$(ACLOCAL_M4): configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} variable and augments the CPPFLAGS
-dnl variable.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
AC_DEFUN([AC_LIB_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
AC_LIB_LINKFLAGS_BODY([$1], [$2])
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
])
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
dnl results of this search when this library appears as a dependency.
HAVE_LIB[]NAME=yes
dnl searches for libname and the libraries corresponding to explicit and
dnl implicit dependencies, together with the specified include files and
dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} variable
-dnl and augments the CPPFLAGS variable, and #defines HAVE_LIB${NAME} to 1.
-dnl Otherwise, it sets and AC_SUBSTs HAVE_LIB${NAME}=no and LIB${NAME} to
-dnl empty.
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl Search for lib[]Name and define LIB[]NAME and INC[]NAME accordingly.
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
AC_LIB_LINKFLAGS_BODY([$1], [$2])
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
dnl $INC[]NAME either.
CPPFLAGS="$ac_save_CPPFLAGS"
LIB[]NAME=
+ LTLIB[]NAME=
fi
AC_SUBST([HAVE_LIB]NAME)
AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
undefine([Name])
undefine([NAME])
])
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the INC${NAME} and LIB${NAME} variables.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
[
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
dnl Search the library and its dependencies in $additional_libdir and
dnl $LDFLAGS. Using breadth-first-seach.
LIB[]NAME=
+ LTLIB[]NAME=
INC[]NAME=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='$1 $2'
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
- AC_LIB_APPENDTOVAR(LIB[]NAME, [$value])
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
else
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
dnl that this library doesn't exist. So just drop it.
fi
else
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME.
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
found_dir=
found_la=
found_so=
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIB[]NAME; do
+ for x in $LDFLAGS $LTLIB[]NAME; do
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
case "$x" in
-L*)
fi
if test "X$found_dir" != "X"; then
dnl Found the library.
- dnl Most of the following complexities is not needed when libtool
- dnl is used.
- ifdef([AC_PROG_][LIBTOOL], [], [
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "X$found_dir" = "X/usr/lib"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- dnl FIXME: Which systems does this affect?
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
fi
fi
fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- ])
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- ifdef([AC_PROG_][LIBTOOL], [], [
- fi
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
fi
- ])
+ fi
dnl Assume the include files are nearby.
additional_includedir=
case "$found_dir" in
dnl Potentially add $additional_includedir to $INCNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS or the already
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
dnl constructed $INCNAME,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
dnl Really add $additional_includedir to $INCNAME.
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME.
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
dnl But don't add it
dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS or the already
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
dnl constructed $LIBNAME,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
dnl 4. if it doesn't exist as a directory.
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
fi
- done
+ fi
if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
dnl Really add $additional_libdir to $LIBNAME.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
*)
dnl Most likely an immediate library name.
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
;;
esac
done
dnl directories known to the linker should also be known to the
dnl runtime loader, otherwise the system is severely misconfigured.)
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
])
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
AC_DEFUN([AC_LIB_APPENDTOVAR],
[
for element in [$2]; do
fi
LIBRPATHX=
+ LTLIBRPATHX=
INCRPATHX=
rpathdirs=
+ ltrpathdirs=
names_already_handled=
names_next_round='rpathx '
while test -n "$names_next_round"; do
if test -n "$value"; then
if test "$value" = yes; then
eval value=\"\$LIB$uppername\"
-
- for element in $value; do
- haveit=
- for x in $LIBRPATHX; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$element"
- fi
- done
-
+ test -z "$value" || LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$value"
else
:
fi
fi
fi
if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LIBRPATHX; do
+ for x in $LDFLAGS $LTLIBRPATHX; do
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
done
fi
if test "X$found_dir" != "X"; then
-
- LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
-
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "X$found_dir" = "X/usr/lib"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_so"
+ else
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$found_a"
+ else
+ LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$found_dir -l$name"
+ fi
+ fi
additional_includedir=
case "$found_dir" in
*/lib | */lib/)
if test "X$additional_includedir" != "X"; then
if test "X$additional_includedir" != "X/usr/include"; then
haveit=
- for x in $CPPFLAGS $INCRPATHX; do
-
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_includedir"; then
INCRPATHX="${INCRPATHX}${INCRPATHX:+ }-I$additional_includedir"
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
if test "X$additional_libdir" != "X/usr/lib"; then
haveit=
- for x in $LDFLAGS $LIBRPATHX; do
-
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBRPATHX; do
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
fi
- fi
+ done
if test -z "$haveit"; then
if test -d "$additional_libdir"; then
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-L$additional_libdir"
fi
fi
+ haveit=
+ for x in $LDFLAGS $LTLIBRPATHX; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-L$additional_libdir"
+ fi
+ fi
fi
fi
;;
;;
*)
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }$dep"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }$dep"
;;
esac
done
fi
else
LIBRPATHX="${LIBRPATHX}${LIBRPATHX:+ }-l$name"
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-l$name"
fi
fi
fi
done
fi
fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBRPATHX="${LTLIBRPATHX}${LTLIBRPATHX:+ }-R$found_dir"
+ done
+ fi
ac_cv_librpathx_libs="$LIBRPATHX"
+ ac_cv_librpathx_ltlibs="$LTLIBRPATHX"
ac_cv_librpathx_cppflags="$INCRPATHX"
fi
echo "$ac_t""$ac_cv_librpathx_libs" 1>&6
LIBRPATHX="$ac_cv_librpathx_libs"
+ LTLIBRPATHX="$ac_cv_librpathx_ltlibs"
INCRPATHX="$ac_cv_librpathx_cppflags"
for element in $INCRPATHX; do
done
+
HAVE_LIBRPATHX=yes
s%@CPP@%$CPP%g
s%@LIBTOOL@%$LIBTOOL%g
s%@LIBRPATHX@%$LIBRPATHX%g
+s%@LTLIBRPATHX@%$LTLIBRPATHX%g
s%@global_top_srcdir@%$global_top_srcdir%g
CEOF
msgid ""
"Choice of input file language:\n"
" -L, --language=NAME recognise the specified language\n"
-" (C, C++, ObjectiveC, PO, Java, YCP)\n"
+" (C, C++, ObjectiveC, PO, Lisp, EmacsLisp,\n"
+" librep, Java, YCP)\n"
" -C, --c++ shorthand for --language=C++\n"
"By default the language is guessed depending on the input file name extension.\n"
msgstr ""
" -s, --sort-output generate sorted output\n"
" -F, --sort-by-file sort output by file location\n"
" --omit-header don't write header with `msgid \"\"' entry\n"
+" --copyright-holder=STRING set copyright holder in output\n"
" --foreign-user omit FSF copyright in output for foreign user\n"
" -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr entries\n"
" -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr entries\n"
projects / thirdparty / gettext.git / commitdiff
