summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/LINGUAS1
-rw-r--r--po/Makefile.in.in433
-rw-r--r--po/de.po256
-rw-r--r--po/fr.po406
-rw-r--r--po/nl.po236
-rw-r--r--po/pl.po244
6 files changed, 889 insertions, 687 deletions
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..2d83356
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+de fr nl pl
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 4d0ee1b..53efc5e 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,19 +1,14 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# This 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 but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Origin: gettext-0.14
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -27,227 +22,345 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
+gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
-SOURCES = cat-id-tbl.c
POFILES = @POFILES@
GMOFILES = @GMOFILES@
-DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
POTFILES = \
CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
+# Makevars gets inserted here. (Don't remove this line!)
-.po.pox:
- $(MAKE) $(PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
.po.mo:
- $(MSGFMT) -o $@ $<
+ @echo "$(MSGFMT) -c -o $@ $<"; \
+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
+ @lang=`echo $* | sed -e 's,.*/,,'`; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-.po.cat:
- sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
+.sin.sed:
+ sed -e '/^#/d' $< > t-$@
+ mv t-$@ $@
all: all-@USE_NLS@
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: stamp-po
all-no:
-$(PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
- --files-from=$(srcdir)/POTFILES.in
- if [ ! -s $(PACKAGE).po ] \
- || cmp -s $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; then \
- rm -f $(PACKAGE).po; \
- else \
- rm -f $(srcdir)/$(PACKAGE).pot \
- && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; \
- fi
-
-cat-id-tbl.c: stamp-cat-id
-stamp-cat-id: $(PACKAGE).pot
- rm -f cat-id-tbl.tmp
- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
- | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
- if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
- rm cat-id-tbl.tmp; \
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ @echo "touch stamp-po"
+ @echo timestamp > stamp-poT
+ @mv stamp-poT stamp-po
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ --files-from=$(srcdir)/POTFILES.in \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+ test ! -f $(DOMAIN).po || { \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+ else \
+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ else \
+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ fi; \
+ }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+ $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
else \
- echo cat-id-tbl.c changed; \
- rm -f $(srcdir)/cat-id-tbl.c; \
- mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
+ $(MAKE) $${lang}.po-create; \
fi
- cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
- if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(datadir); \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ for file in $(DISTFILES.common) Makevars.template; do \
+ $(INSTALL_DATA) $(srcdir)/$$file \
+ $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ for file in Makevars; do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
else \
- $(top_srcdir)/mkinstalldirs $(datadir); \
+ : ; \
fi
+install-data-no: all
+install-data-yes: all
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
- if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $$dir; \
- else \
- $(top_srcdir)/mkinstalldirs $$dir; \
- fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- else \
- true; \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
fi; \
- fi; \
+ done; \
done
- if test "$(PACKAGE)" = "gettext"; then \
- if test -r $(MKINSTALLDIRS); then \
- $(MKINSTALLDIRS) $(gettextsrcdir); \
- else \
- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
- fi; \
- cd $(srcdir) && \
- $(INSTALL_DATA) Makefile.in.in $(gettextsrcdir)/Makefile.in.in; \
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
+installdirs-data-no:
+installdirs-data-yes:
+ $(mkinstalldirs) $(DESTDIR)$(datadir)
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ dir=$(localedir)/$$lang/LC_MESSAGES; \
+ $(mkinstalldirs) $(DESTDIR)$$dir; \
+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ if test -n "$$lc"; then \
+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+ for file in *; do \
+ if test -f $$file; then \
+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+ fi; \
+ done); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+ else \
+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+ :; \
+ else \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+ fi; \
+ fi; \
+ fi; \
+ done; \
+ done
# Define this as empty until I found a useful application.
installcheck:
-uninstall:
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ for file in $(DISTFILES.common) Makevars.template; do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
+ else \
+ : ; \
+ fi
+uninstall-data-no:
+uninstall-data-yes:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ done; \
done
- rm -f $(gettextsrcdir)/po-Makefile.in.in
check: all
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
mostlyclean:
- rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+ rm -f remove-potcdate.sed
+ rm -f stamp-poT
+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+ rm -f Makefile Makefile.in POTFILES *.mo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
- for file in $(DISTFILES); do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
+ rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+ $(MAKE) update-po
+ @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: $(DISTFILES)
+ dists="$(DISTFILES)"; \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ dists="$$dists Makevars.template"; \
+ fi; \
+ if test -f $(srcdir)/ChangeLog; then \
+ dists="$$dists ChangeLog"; \
+ fi; \
+ for i in 0 1 2 3 4 5 6 7 8 9; do \
+ if test -f $(srcdir)/ChangeLog.$$i; then \
+ dists="$$dists ChangeLog.$$i"; \
+ fi; \
+ done; \
+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+ for file in $$dists; do \
+ if test -f $$file; then \
+ cp -p $$file $(distdir); \
+ else \
+ cp -p $(srcdir)/$$file $(distdir); \
+ fi; \
done
update-po: Makefile
- $(MAKE) $(PACKAGE).pot
- PATH=`pwd`/../src:$$PATH; \
+ $(MAKE) $(DOMAIN).pot-update
+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+ $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+ exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+ tmpdir=`pwd`; \
+ echo "$$lang:"; \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
- mv $$lang.po $$lang.old.po; \
- echo "$$lang:"; \
- if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
- rm -f $$lang.old.po; \
+ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
else \
- echo "msgmerge for $$cat failed!"; \
- rm -f $$lang.po; \
- mv $$lang.old.po $$lang.po; \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ exit 1; \
+ fi; \
fi; \
- done
+ else \
+ echo "msgmerge for $$lang.po failed!" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi
-POTFILES: POTFILES.in
- ( if test 'x$(srcdir)' != 'x.'; then \
- posrcprefix='$(top_srcdir)/'; \
- else \
- posrcprefix="../"; \
- fi; \
- sed -e '/^#/d' -e '/^[ ]*$$/d' \
- -e "s@.*@ $$posrcprefix& \\\\@" \
- -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+ @:
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
+ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status
+force:
+
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/po/de.po b/po/de.po
index 1a2ba40..e6595e2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU mkid 3.0.8\n"
-"POT-Creation-Date: 2000-06-06 18:36+0200\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2005-10-06 13:04+0200\n"
"PO-Revision-Date: 1996-03-23 22:34 MET\n"
"Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -13,13 +14,18 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: libidu/fnprint.c:135
+#, c-format
+msgid "invalid `--separator' style: `%s'"
+msgstr ""
+
#: libidu/hash.c:51
#, c-format
msgid "can't allocate %ld bytes for hash table: memory exhausted"
msgstr ""
#: libidu/hash.c:264
-#, fuzzy
+#, fuzzy, c-format
msgid "Load=%ld/%ld=%.0f%%, "
msgstr "\"Load\"=%ld/%ld=%.2f, "
@@ -29,82 +35,84 @@ msgid "Rehash=%d, "
msgstr "\"Rehash\"=%d, "
#: libidu/hash.c:267
+#, c-format
msgid "Collisions=%ld/%ld=%.0f%%"
msgstr ""
-#: libidu/idfile.c:112
+#: libidu/idfile.c:104
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
+#: libidu/idread.c:49 src/mkid.c:454 src/xtokid.c:227
#, c-format
msgid "can't open `%s'"
msgstr ""
-#: libidu/idread.c:64
+#: libidu/idread.c:68
#, c-format
msgid "`%s' is not an ID file! (bad magic #)"
msgstr ""
-#: libidu/idread.c:66
+#: libidu/idread.c:70
#, c-format
msgid "`%s' is version %d, but I only grok version %d"
msgstr ""
-#: libidu/idread.c:186
+#: libidu/idread.c:190
#, fuzzy, c-format
msgid "unsupported size in io_read (): %d"
msgstr "Nicht unterstützte Größe (`size') in \"io_read ()\": %d"
-#: libidu/idread.c:194 libidu/idwrite.c:167
+#: libidu/idread.c:198 libidu/idwrite.c:168
#, c-format
msgid "unknown I/O type: %d"
msgstr ""
-#: libidu/idwrite.c:156
+#: libidu/idwrite.c:157
#, fuzzy, c-format
msgid "unsupported size in io_write (): %d"
msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d"
-#: libidu/scanners.c:102
+#: libidu/scanners.c:93
#, fuzzy, c-format
msgid "unrecognized language: `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:148
+#: libidu/scanners.c:139
msgid "can't allocate language args obstack: memory exhausted"
msgstr ""
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:193 libidu/scanners.c:262
msgid "can't allocate language args: memory exhausted"
msgstr ""
-#: libidu/scanners.c:210
+#: libidu/scanners.c:201
#, c-format
msgid "language name expected following `%s' in file `%s'"
msgstr ""
-#: libidu/scanners.c:265
+#: libidu/scanners.c:256
#, fuzzy, c-format
msgid "can't open language map file `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:267
+#: libidu/scanners.c:258
#, c-format
msgid "can't get size of map file `%s'"
msgstr ""
-#: libidu/scanners.c:277
+#: libidu/scanners.c:268
#, fuzzy, c-format
msgid "can't read language map file `%s'"
msgstr "Kein Scanner für die Sprache '%s'"
-#: libidu/scanners.c:280
+#: libidu/scanners.c:271
#, c-format
msgid "can't read entire language map file `%s'"
msgstr ""
-#: libidu/scanners.c:425
+#: libidu/scanners.c:416
+#, c-format
msgid ""
"C language:\n"
" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
@@ -115,17 +123,18 @@ msgid ""
"strings\n"
msgstr ""
-#: libidu/scanners.c:708 libidu/scanners.c:979 libidu/scanners.c:1182
+#: libidu/scanners.c:699 libidu/scanners.c:970 libidu/scanners.c:1173
#, c-format
msgid "junk: `%c'"
msgstr "\"junk\": '%c'"
-#: libidu/scanners.c:710 libidu/scanners.c:981 libidu/scanners.c:1184
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
#, c-format
msgid "junk: `\\%03o'"
msgstr "\"junk\": '\\%03o'"
-#: libidu/scanners.c:814
+#: libidu/scanners.c:805
+#, c-format
msgid ""
"Assembly language:\n"
" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
@@ -135,7 +144,8 @@ msgid ""
" -n,--no-cpp Don't handle C pre-processor directives\n"
msgstr ""
-#: libidu/scanners.c:1085
+#: libidu/scanners.c:1076
+#, c-format
msgid ""
"Text language:\n"
" -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token "
@@ -144,118 +154,126 @@ msgid ""
"delimiters\n"
msgstr ""
-#: libidu/walker.c:114
+#: libidu/walker.c:111
#, c-format
msgid "can't read directory `%s' (`.' from `%s')"
msgstr ""
-#: libidu/walker.c:181
+#: libidu/walker.c:178
#, c-format
msgid "notice: `%s' was a %s, but is now a %s!"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "file"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "directory"
msgstr ""
-#: libidu/walker.c:306
+#: libidu/walker.c:303
#, c-format
msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
msgstr ""
-#: libidu/walker.c:400
+#: libidu/walker.c:397
#, c-format
msgid "notice: scan parameters changed for `%s'"
msgstr ""
-#: libidu/walker.c:604
+#: libidu/walker.c:600
#, fuzzy
msgid "can't get working directory"
msgstr "%s: Name des aktuellen Verzeichnisses nicht zu erreichen."
-#: libidu/walker.c:661
+#: libidu/walker.c:657
#, c-format
msgid "can't chdir to `%s'"
msgstr ""
-#: libidu/walker.c:666
+#: libidu/walker.c:662
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:727
+#: libidu/walker.c:723
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:735
+#: libidu/walker.c:731
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr ""
-#: lib/getopt.c:527
+#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:550
+#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:555
+#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:570
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr ""
-#. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
-#. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr ""
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:627
+#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: lib/getopt.c:630
+#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr ""
-#: lib/getopt.c:666
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:123 src/xtokid.c:47
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/fid.c:78
+#: src/fid.c:81
#, c-format
msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
msgstr ""
-#: src/fid.c:81
+#: src/fid.c:84
+#, c-format
msgid ""
"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
"also given list the identifiers that occur in both files.\n"
@@ -265,34 +283,35 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/fid.c:141
+#: src/fid.c:147
msgid "no file name arguments"
msgstr ""
-#: src/fid.c:146
+#: src/fid.c:152
msgid "too many file name arguments"
msgstr ""
-#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
+#: src/fid.c:159 src/fnid.c:154 src/lid.c:413
msgid "can't locate `ID'"
msgstr ""
-#: src/fid.c:235
+#: src/fid.c:241
#, c-format
msgid "`%s' is ambiguous"
msgstr ""
-#: src/fid.c:241
+#: src/fid.c:247
#, fuzzy, c-format
msgid "`%s' not found"
msgstr "%s: nicht gefunden"
-#: src/fnid.c:66
+#: src/fnid.c:70
#, c-format
msgid "Usage: %s [OPTION]... [PATTERN]...\n"
msgstr ""
-#: src/fnid.c:70
+#: src/fnid.c:74
+#, c-format
msgid ""
"Print constituent file names that match PATTERN,\n"
"using shell-style wildcards.\n"
@@ -302,12 +321,12 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:241
+#: src/lid.c:245
#, c-format
msgid "Usage: %s [OPTION]... PATTERN...\n"
msgstr ""
-#: src/lid.c:245
+#: src/lid.c:249
#, c-format
msgid ""
"Query ID database and report results.\n"
@@ -330,8 +349,8 @@ msgid ""
" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
"`none'\n"
" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
+" only applies to file names when `--"
+"result=filenames'\n"
" The above STYLE options control how query results are "
"presented.\n"
" Defaults are --key=token --result=filenames --separator=%s\n"
@@ -352,66 +371,66 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "braces"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "space"
msgstr ""
-#: src/lid.c:347
+#: src/lid.c:353
msgid "notice: use of `-e' is deprecated, use `-r' instead"
msgstr ""
-#: src/lid.c:428
+#: src/lid.c:434
#, fuzzy, c-format
msgid "All identifiers are non-ambiguous within the first %d characters\n"
msgstr ""
"Alle Bezeichner (id's) sind verschieden hinsichtlich der ersten %d Zeichen\n"
-#: src/lid.c:463
+#: src/lid.c:469
#, c-format
msgid "invalid `--key' style: `%s'"
msgstr ""
-#: src/lid.c:475
+#: src/lid.c:481
#, c-format
msgid "invalid `--result' style: `%s'"
msgstr ""
# Muss hier auf `_j_ ... / nq' umgestellt werden????
-#. FIXME: i18n of responses
-#: src/lid.c:632
-#, fuzzy
+#: src/lid.c:638
+#, fuzzy, c-format
msgid "edit? [y1-9^S/nq] "
msgstr "Editieren? [y1-9^S/nq] "
-#: src/lid.c:701
+#: src/lid.c:707
msgid "can't fork"
msgstr ""
-#: src/lid.c:719
+#: src/lid.c:725
#, c-format
msgid "can't exec `%s'"
msgstr ""
-#: src/lid.c:860
+#: src/lid.c:866
msgid "can't match regular-expression: memory exhausted"
msgstr ""
-#: src/mkid.c:147 src/xtokid.c:64
+#: src/mkid.c:148 src/xtokid.c:68
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr ""
-#: src/mkid.c:151
+#: src/mkid.c:152
+#, c-format
msgid ""
"Build an identifier database.\n"
" -o, --output=OUTFILE file name of ID database output\n"
" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -431,112 +450,114 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:357
+#: src/mkid.c:360
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:361
+#: src/mkid.c:364
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:434
+#: src/mkid.c:437
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:503
+#: src/mkid.c:506
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", new=%d/%d"
-#: src/mkid.c:512
+#: src/mkid.c:515
#, c-format
msgid "Name=%ld, "
msgstr "Name=%ld, "
-#: src/mkid.c:513
+#: src/mkid.c:516
#, c-format
msgid "Number=%ld, "
msgstr "Zahl=%ld, "
-#: src/mkid.c:514
+#: src/mkid.c:517
#, c-format
msgid "String=%ld, "
msgstr "Zeichenkette=%ld, "
# ist das gemeint? ###
-#: src/mkid.c:515
+#: src/mkid.c:518
#, c-format
msgid "Literal=%ld, "
msgstr "Zeichen=%ld, "
-#: src/mkid.c:516
+#: src/mkid.c:519
#, c-format
msgid "Comment=%ld\n"
msgstr "Kommentar=%ld\n"
-#: src/mkid.c:518
+#: src/mkid.c:521
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Dateien=%d, "
-#: src/mkid.c:519
+#: src/mkid.c:522
#, c-format
msgid "Tokens=%ld, "
msgstr "Tokens=%ld, "
-#: src/mkid.c:520
+#: src/mkid.c:523
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bytes=%ld Kb, "
-#: src/mkid.c:521
+#: src/mkid.c:524
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "\"Heap\"=%ld Kb, "
-#: src/mkid.c:523
+#: src/mkid.c:526
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n"
# Frequenz übersetzen? ke
-#: src/mkid.c:526
+#: src/mkid.c:529
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "\"Freq\"=%ld/%ld=%.2f\n"
-#: src/mkid.c:550
+#: src/mkid.c:553
+#, c-format
msgid "Sorting tokens...\n"
msgstr "Sortiere \"Token\"...\n"
-#: src/mkid.c:556
+#: src/mkid.c:559
#, c-format
msgid "Writing `%s'...\n"
msgstr "Schreibe '%s'...\n"
-#: src/mkid.c:559
+#: src/mkid.c:562
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:626
+#: src/mkid.c:629
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:714
-#, fuzzy
+#: src/mkid.c:717
+#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "level %d: %ld == %ld\n"
-#: src/xtokid.c:68
+#: src/xtokid.c:72
+#, c-format
msgid ""
"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -605,8 +626,8 @@ msgstr ""
#~ msgid "%s: Use only one of: -u, -f<file>, or cmd-line for file args!\n"
#~ msgstr ""
-#~ "%s: Nur eins nehmen: '-u', '-f<DATEI>' oder Befehlszeile für die "
-#~ "Datei-Parameter!\n"
+#~ "%s: Nur eins nehmen: '-u', '-f<DATEI>' oder Befehlszeile für die Datei-"
+#~ "Parameter!\n"
#~ msgid ""
#~ "\n"
@@ -641,8 +662,8 @@ msgstr ""
#~ msgstr "%s: Achtung: '%s/%s' überschreibt '%s/%s'\n"
#~ msgid ""
-#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] "
-#~ "[-S<lang>/<lang>/<filter>]\n"
+#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] [-"
+#~ "S<lang>/<lang>/<filter>]\n"
#~ msgstr ""
#~ "Syntax: %s [-S<SUFFIX>=<LANG>] [+S(+|-)<ARG>]\n"
#~ " [-S<LANG>(+|-)<ARG>] [-S<LANG>/<LANG>/<FILTER>]\n"
@@ -665,8 +686,8 @@ msgstr ""
#~ "\n"
#~ " (+|-)u Den führenden '_' von den \"ids\" in den Zeichenketten\n"
#~ " (entfernen | nicht entfernen).\n"
-#~ " (+|-)s<CC> <CC> in den \"ids\" der Zeichenketten erlauben und solche "
-#~ "\"ids\"\n"
+#~ " (+|-)s<CC> <CC> in den \"ids\" der Zeichenketten erlauben und "
+#~ "solche \"ids\"\n"
#~ " (auswerten [`keep'] | übergehen).\n"
#~ " -v \"vhil\"-Kommentare übergehen."
@@ -683,13 +704,16 @@ msgstr ""
#~ " (+|-)C . . . . (Do|Don't) handle C-style comments. (/* */)"
#~ msgstr ""
#~ "Die Assembler-Scanner-Parameter haben die Form '-Sasm<ARG>', wobei\n"
-#~ "<ARG> eins der folgenden ist: (<CC> bezeichnet ein oder mehrere Zeichen).\n"
+#~ "<ARG> eins der folgenden ist: (<CC> bezeichnet ein oder mehrere "
+#~ "Zeichen).\n"
#~ "\n"
#~ " -c<CC> <CC> beginnt/en einen Kommentar bis zum Zeilenende.\n"
-#~ " (+|-)u Führenden '_' von den \"ids\" (entfernen | nicht entfernen).\n"
+#~ " (+|-)u Führenden '_' von den \"ids\" (entfernen | nicht "
+#~ "entfernen).\n"
#~ " (+|-)a<cc> <CC> in den \"ids\" der Zeichenketten erlauben und solche "
#~ "\"ids\".\n"
-#~ " (+|-)p C-Preprozessor-Anweisungen (bearbeiten | nicht bearbeiten).\n"
+#~ " (+|-)p C-Preprozessor-Anweisungen (bearbeiten | nicht "
+#~ "bearbeiten).\n"
#~ " (+|-)C C-Kommentare `/* */' (bearbeiten | nicht bearbeiten)."
#~ msgid "Usage: %s -S%s([(+|-)a<cc>] [(+|-)s<cc>]\n"
@@ -702,17 +726,19 @@ msgstr ""
#~ " (+|-)s<cc> . . Squeeze (or don't squeeze) <cc> out of ids."
#~ msgstr ""
#~ "Die Text-Scanner-Parameter haben die Form '-Stext<ARG>', wobei\n"
-#~ "<ARG> eins der folgenden ist: (<CC> bezeichnet ein oder mehrere Zeichen).\n"
+#~ "<ARG> eins der folgenden ist: (<CC> bezeichnet ein oder mehrere "
+#~ "Zeichen).\n"
#~ "\n"
-#~ " (+|-)a<CC> <CC> in den \"ids\" (einschliessen | nicht einschliessen).\n"
+#~ " (+|-)a<CC> <CC> in den \"ids\" (einschliessen | nicht "
+#~ "einschliessen).\n"
#~ " (+|-)s<CC> <CC> aus den \"ids\" (rauswerfen | nicht rauswerfen)."
#~ msgid "open"
#~ msgstr "öffne"
#~ msgid ""
-#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-a<argfile>] "
-#~ "[-] [-u] [files...]\n"
+#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-"
+#~ "a<argfile>] [-] [-u] [files...]\n"
#~ "\t-v\t Verbose: print reports of progress\n"
#~ "\t-a<file> Open file for arguments\n"
#~ "\t-\t Read newline-separated args from stdin\n"
@@ -729,12 +755,14 @@ msgstr ""
#~ "\n"
#~ " -v Ausführlich: den Fortgang anzeigen.\n"
#~ " -a<DATEI> DATEI öffnen und Parameter entnehmen.\n"
-#~ " - Durch Zeilenende-Zeichen (NL) unterteilte Argumente\n"
+#~ " - Durch Zeilenende-Zeichen (NL) unterteilte "
+#~ "Argumente\n"
#~ " von der Standard-Eingabe lesen.\n"
#~ " -l<LANG> Dateien als <LANG> scannen, bis +l<LANG>.\n"
#~ " -S<LANG>-<ARG> ARG an den Scanner <LANG> weiterreichen.\n"
#~ " -S.<SUFFIX>=<LANG> Dateien mit .<SUFFIX> als <LANG> scannen.\n"
-#~ " -S<LANG>? Dokumentation für die Anwendung von <LANG> ausgeben.\n"
+#~ " -S<LANG>? Dokumentation für die Anwendung von <LANG> "
+#~ "ausgeben.\n"
#~ " -u Eine bestehende Datenbank aktualisieren (nicht\n"
#~ " implementiert).\n"
#~ "\n"
diff --git a/po/fr.po b/po/fr.po
index f8ea664..1b389ad 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,14 +5,20 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-06-06 18:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: GNU mkid 3.0.8\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2005-10-06 13:04+0200\n"
+"PO-Revision-Date: 1996-03-23 22:34 MET\n"
+"Last-Translator: Unknown <unknown@unknown.fr>\n"
+"Language-Team: French <fr@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: libidu/fnprint.c:135
+#, c-format
+msgid "invalid `--separator' style: `%s'"
+msgstr ""
# msgid ""
# msgstr ""
@@ -30,7 +36,7 @@ msgid "can't allocate %ld bytes for hash table: memory exhausted"
msgstr ""
#: libidu/hash.c:264
-#, fuzzy
+#, fuzzy, c-format
msgid "Load=%ld/%ld=%.0f%%, "
msgstr "Charge=%ld/%ld=%.2f, "
@@ -40,82 +46,84 @@ msgid "Rehash=%d, "
msgstr "Rehacher=%d, "
#: libidu/hash.c:267
+#, c-format
msgid "Collisions=%ld/%ld=%.0f%%"
msgstr ""
-#: libidu/idfile.c:112
+#: libidu/idfile.c:104
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
+#: libidu/idread.c:49 src/mkid.c:454 src/xtokid.c:227
#, c-format
msgid "can't open `%s'"
msgstr ""
-#: libidu/idread.c:64
+#: libidu/idread.c:68
#, c-format
msgid "`%s' is not an ID file! (bad magic #)"
msgstr ""
-#: libidu/idread.c:66
+#: libidu/idread.c:70
#, c-format
msgid "`%s' is version %d, but I only grok version %d"
msgstr ""
-#: libidu/idread.c:186
+#: libidu/idread.c:190
#, fuzzy, c-format
msgid "unsupported size in io_read (): %d"
-msgstr "Paramčtre taille passé ŕ io_read () non suporté: %d"
+msgstr "Paramtre taille pass io_read () non suport: %d"
-#: libidu/idread.c:194 libidu/idwrite.c:167
+#: libidu/idread.c:198 libidu/idwrite.c:168
#, c-format
msgid "unknown I/O type: %d"
msgstr ""
-#: libidu/idwrite.c:156
+#: libidu/idwrite.c:157
#, fuzzy, c-format
msgid "unsupported size in io_write (): %d"
-msgstr "Paramčtre taille passé ŕ io_write () non suporté: %d"
+msgstr "Paramtre taille pass io_write () non suport: %d"
-#: libidu/scanners.c:102
+#: libidu/scanners.c:93
#, fuzzy, c-format
msgid "unrecognized language: `%s'"
msgstr "Pas d'analyseur lexical pour le langag `%s'"
-#: libidu/scanners.c:148
+#: libidu/scanners.c:139
msgid "can't allocate language args obstack: memory exhausted"
msgstr ""
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:193 libidu/scanners.c:262
msgid "can't allocate language args: memory exhausted"
msgstr ""
-#: libidu/scanners.c:210
+#: libidu/scanners.c:201
#, c-format
msgid "language name expected following `%s' in file `%s'"
msgstr ""
-#: libidu/scanners.c:265
+#: libidu/scanners.c:256
#, fuzzy, c-format
msgid "can't open language map file `%s'"
msgstr "Pas d'analyseur lexical pour le langag `%s'"
-#: libidu/scanners.c:267
+#: libidu/scanners.c:258
#, c-format
msgid "can't get size of map file `%s'"
msgstr ""
-#: libidu/scanners.c:277
+#: libidu/scanners.c:268
#, fuzzy, c-format
msgid "can't read language map file `%s'"
msgstr "Pas d'analyseur lexical pour le langag `%s'"
-#: libidu/scanners.c:280
+#: libidu/scanners.c:271
#, c-format
msgid "can't read entire language map file `%s'"
msgstr ""
-#: libidu/scanners.c:425
+#: libidu/scanners.c:416
+#, c-format
msgid ""
"C language:\n"
" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
@@ -126,17 +134,18 @@ msgid ""
"strings\n"
msgstr ""
-#: libidu/scanners.c:708 libidu/scanners.c:979 libidu/scanners.c:1182
+#: libidu/scanners.c:699 libidu/scanners.c:970 libidu/scanners.c:1173
#, c-format
msgid "junk: `%c'"
-msgstr "déchet: `%c'"
+msgstr "dchet: `%c'"
-#: libidu/scanners.c:710 libidu/scanners.c:981 libidu/scanners.c:1184
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
#, c-format
msgid "junk: `\\%03o'"
-msgstr "déchet: `\\%03o'"
+msgstr "dchet: `\\%03o'"
-#: libidu/scanners.c:814
+#: libidu/scanners.c:805
+#, c-format
msgid ""
"Assembly language:\n"
" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
@@ -146,7 +155,8 @@ msgid ""
" -n,--no-cpp Don't handle C pre-processor directives\n"
msgstr ""
-#: libidu/scanners.c:1085
+#: libidu/scanners.c:1076
+#, c-format
msgid ""
"Text language:\n"
" -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token "
@@ -155,118 +165,126 @@ msgid ""
"delimiters\n"
msgstr ""
-#: libidu/walker.c:114
+#: libidu/walker.c:111
#, c-format
msgid "can't read directory `%s' (`.' from `%s')"
msgstr ""
-#: libidu/walker.c:181
+#: libidu/walker.c:178
#, c-format
msgid "notice: `%s' was a %s, but is now a %s!"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "file"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "directory"
msgstr ""
-#: libidu/walker.c:306
+#: libidu/walker.c:303
#, c-format
msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
msgstr ""
-#: libidu/walker.c:400
+#: libidu/walker.c:397
#, c-format
msgid "notice: scan parameters changed for `%s'"
msgstr ""
-#: libidu/walker.c:604
+#: libidu/walker.c:600
#, fuzzy
msgid "can't get working directory"
-msgstr "%s: Impossible d'obtenir le répertoire courant."
+msgstr "%s: Impossible d'obtenir le rpertoire courant."
-#: libidu/walker.c:661
+#: libidu/walker.c:657
#, c-format
msgid "can't chdir to `%s'"
msgstr ""
-#: libidu/walker.c:666
+#: libidu/walker.c:662
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:727
+#: libidu/walker.c:723
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:735
+#: libidu/walker.c:731
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr ""
-#: lib/getopt.c:527
+#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:550
+#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:555
+#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:570
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr ""
-#. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
-#. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr ""
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:627
+#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: lib/getopt.c:630
+#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr ""
-#: lib/getopt.c:666
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:123 src/xtokid.c:47
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/fid.c:78
+#: src/fid.c:81
#, c-format
msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
msgstr ""
-#: src/fid.c:81
+#: src/fid.c:84
+#, c-format
msgid ""
"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
"also given list the identifiers that occur in both files.\n"
@@ -276,34 +294,35 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/fid.c:141
+#: src/fid.c:147
msgid "no file name arguments"
msgstr ""
-#: src/fid.c:146
+#: src/fid.c:152
msgid "too many file name arguments"
msgstr ""
-#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
+#: src/fid.c:159 src/fnid.c:154 src/lid.c:413
msgid "can't locate `ID'"
msgstr ""
-#: src/fid.c:235
+#: src/fid.c:241
#, c-format
msgid "`%s' is ambiguous"
msgstr ""
-#: src/fid.c:241
+#: src/fid.c:247
#, fuzzy, c-format
msgid "`%s' not found"
-msgstr "%s pas trouvé"
+msgstr "%s pas trouv"
-#: src/fnid.c:66
+#: src/fnid.c:70
#, c-format
msgid "Usage: %s [OPTION]... [PATTERN]...\n"
msgstr ""
-#: src/fnid.c:70
+#: src/fnid.c:74
+#, c-format
msgid ""
"Print constituent file names that match PATTERN,\n"
"using shell-style wildcards.\n"
@@ -313,12 +332,12 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:241
+#: src/lid.c:245
#, c-format
msgid "Usage: %s [OPTION]... PATTERN...\n"
msgstr ""
-#: src/lid.c:245
+#: src/lid.c:249
#, c-format
msgid ""
"Query ID database and report results.\n"
@@ -341,8 +360,8 @@ msgid ""
" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
"`none'\n"
" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
+" only applies to file names when `--"
+"result=filenames'\n"
" The above STYLE options control how query results are "
"presented.\n"
" Defaults are --key=token --result=filenames --separator=%s\n"
@@ -363,64 +382,64 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "braces"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "space"
msgstr ""
-#: src/lid.c:347
+#: src/lid.c:353
msgid "notice: use of `-e' is deprecated, use `-r' instead"
msgstr ""
-#: src/lid.c:428
+#: src/lid.c:434
#, fuzzy, c-format
msgid "All identifiers are non-ambiguous within the first %d characters\n"
-msgstr "Tous les identificateurs sont unique dans les premiers %d caractčres\n"
+msgstr "Tous les identificateurs sont unique dans les premiers %d caractres\n"
-#: src/lid.c:463
+#: src/lid.c:469
#, c-format
msgid "invalid `--key' style: `%s'"
msgstr ""
-#: src/lid.c:475
+#: src/lid.c:481
#, c-format
msgid "invalid `--result' style: `%s'"
msgstr ""
-#. FIXME: i18n of responses
-#: src/lid.c:632
-#, fuzzy
+#: src/lid.c:638
+#, fuzzy, c-format
msgid "edit? [y1-9^S/nq] "
-msgstr "Éditer? [y1-9^S/nq] "
+msgstr "diter? [y1-9^S/nq] "
-#: src/lid.c:701
+#: src/lid.c:707
msgid "can't fork"
msgstr ""
-#: src/lid.c:719
+#: src/lid.c:725
#, c-format
msgid "can't exec `%s'"
msgstr ""
-#: src/lid.c:860
+#: src/lid.c:866
msgid "can't match regular-expression: memory exhausted"
msgstr ""
-#: src/mkid.c:147 src/xtokid.c:64
+#: src/mkid.c:148 src/xtokid.c:68
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr ""
-#: src/mkid.c:151
+#: src/mkid.c:152
+#, c-format
msgid ""
"Build an identifier database.\n"
" -o, --output=OUTFILE file name of ID database output\n"
" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -440,110 +459,112 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:357
+#: src/mkid.c:360
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:361
+#: src/mkid.c:364
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:434
+#: src/mkid.c:437
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:503
+#: src/mkid.c:506
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", nouveau=%d/%d"
-#: src/mkid.c:512
+#: src/mkid.c:515
#, c-format
msgid "Name=%ld, "
msgstr "Nom=%ld, "
-#: src/mkid.c:513
+#: src/mkid.c:516
#, c-format
msgid "Number=%ld, "
-msgstr "Numéro=%ld, "
+msgstr "Numro=%ld, "
-#: src/mkid.c:514
+#: src/mkid.c:517
#, c-format
msgid "String=%ld, "
-msgstr "Chaîne=%ld, "
+msgstr "Chane=%ld, "
-#: src/mkid.c:515
+#: src/mkid.c:518
#, c-format
msgid "Literal=%ld, "
-msgstr "Litéral=%ld, "
+msgstr "Litral=%ld, "
-#: src/mkid.c:516
+#: src/mkid.c:519
#, c-format
msgid "Comment=%ld\n"
msgstr "Commentaire=%ld\n"
-#: src/mkid.c:518
+#: src/mkid.c:521
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Fichiers=%d, "
-#: src/mkid.c:519
+#: src/mkid.c:522
#, c-format
msgid "Tokens=%ld, "
-msgstr "Unités lexicales=%ld, "
+msgstr "Units lexicales=%ld, "
-#: src/mkid.c:520
+#: src/mkid.c:523
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Octets=%ld Kb, "
-#: src/mkid.c:521
+#: src/mkid.c:524
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "tas=%ld Kb, "
-#: src/mkid.c:523
+#: src/mkid.c:526
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
-msgstr "Sortie=%ld (%ld unités lexicales, %ld Touches)\n"
+msgstr "Sortie=%ld (%ld units lexicales, %ld Touches)\n"
-#: src/mkid.c:526
+#: src/mkid.c:529
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "Freq=%ld/%ld=%.2f\n"
-#: src/mkid.c:550
+#: src/mkid.c:553
+#, c-format
msgid "Sorting tokens...\n"
-msgstr "Tri unités lexicales...\n"
+msgstr "Tri units lexicales...\n"
-#: src/mkid.c:556
+#: src/mkid.c:559
#, c-format
msgid "Writing `%s'...\n"
-msgstr "Écriture `%s'...\n"
+msgstr "criture `%s'...\n"
-#: src/mkid.c:559
+#: src/mkid.c:562
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:626
+#: src/mkid.c:629
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:714
-#, fuzzy
+#: src/mkid.c:717
+#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "niveau %d: %ld == %ld\n"
-#: src/xtokid.c:68
+#: src/xtokid.c:72
+#, c-format
msgid ""
"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -557,10 +578,10 @@ msgid ""
msgstr ""
#~ msgid "%s: not found\n"
-#~ msgstr "%s pas trouvé\n"
+#~ msgstr "%s pas trouv\n"
#~ msgid "Bogus frequencies: %u > %u\n"
-#~ msgstr "Fréquences de bogus: %u > %u\n"
+#~ msgstr "Frquences de bogus: %u > %u\n"
#~ msgid "Usage: %s [-f<file>] file1 file2\n"
#~ msgstr "Usage: %s [-f<fichier>] fichier1 fichier2\n"
@@ -575,7 +596,7 @@ msgstr ""
#~ msgstr "%s: Erreur de syntaxe: %s (%s)\n"
#~ msgid "%s: cannot determine current directory\n"
-#~ msgstr "%s: impossible de déterminer le répertoire courant\n"
+#~ msgstr "%s: impossible de dterminer le rpertoire courant\n"
#~ msgid " uniq=%d/%d"
#~ msgstr " unique=%d/%d"
@@ -598,10 +619,10 @@ msgstr ""
#, fuzzy
#~ msgid "nothing to do..."
-#~ msgstr "Rien ŕ faire...\n"
+#~ msgstr "Rien faire...\n"
#~ msgid "%s: No language assigned to suffix: `%s'\n"
-#~ msgstr "%s: Pas de langage correspondant ŕ ce suffixe: `%s'\n"
+#~ msgstr "%s: Pas de langage correspondant ce suffixe: `%s'\n"
#~ msgid "Probes=%ld/%ld=%.2f, "
#~ msgstr "Probants=%ld/%ld=%.2f, "
@@ -618,11 +639,11 @@ msgstr ""
#~ "\tRehashing... (doubling size to %ld)\n"
#~ msgstr ""
#~ "\n"
-#~ "\tRehachage... (Taille doublée ŕ%ld)\n"
+#~ "\tRehachage... (Taille double %ld)\n"
#, fuzzy
#~ msgid "duplicate hash entry `%s'"
-#~ msgstr "%s: Entrée de hachage dupliquée! \n"
+#~ msgstr "%s: Entre de hachage duplique! \n"
#~ msgid "%s: Not an id file: `%s'\n"
#~ msgstr "%s: N'est pas un fichier id: `%s'\n"
@@ -634,29 +655,29 @@ msgstr ""
#~ msgstr "Pas d'analyseur lexical correspondant au suffixe `%s'\n"
#~ msgid "%s: Language undefined: %s\n"
-#~ msgstr "%s: Langage indéfini: %s\n"
+#~ msgstr "%s: Langage indfini: %s\n"
#~ msgid "%s: Note: `%s=%s' overrides `%s=%s'\n"
-#~ msgstr "%s: Avertissement: `%s=%s' dépassements `%s=%s'\n"
+#~ msgstr "%s: Avertissement: `%s=%s' dpassements `%s=%s'\n"
#~ msgid "%s: language %s not defined.\n"
-#~ msgstr "%s: langage %s non défini.\n"
+#~ msgstr "%s: langage %s non dfini.\n"
#~ msgid "%s: Note: `%s/%s' overrides `%s/%s'\n"
-#~ msgstr "%s: Avertissement: `%s/%s' dépassements `%s/%s'\n"
+#~ msgstr "%s: Avertissement: `%s/%s' dpassements `%s/%s'\n"
#~ msgid ""
-#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] "
-#~ "[-S<lang>/<lang>/<filter>]\n"
+#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] [-"
+#~ "S<lang>/<lang>/<filter>]\n"
#~ msgstr ""
-#~ "Usage: %s [-S<suffixe>=<lang>] [+S(+|-)<param>] [-S<lang>(+|-)<param>] "
-#~ "[-S<lang>/<lang>/<filtre>]\n"
+#~ "Usage: %s [-S<suffixe>=<lang>] [+S(+|-)<param>] [-S<lang>(+|-)<param>] [-"
+#~ "S<lang>/<lang>/<filtre>]\n"
#~ msgid "junk: `\\%3o'"
-#~ msgstr "déchet: `\\%3o'"
+#~ msgstr "dchet: `\\%3o'"
#~ msgid "Usage: %s does not accept %s scanner arguments\n"
-#~ msgstr "Usage: %s n'accčpte pas les paramčtres de l'analyseur lexical %s\n"
+#~ msgstr "Usage: %s n'accpte pas les paramtres de l'analyseur lexical %s\n"
#, fuzzy
#~ msgid ""
@@ -665,12 +686,12 @@ msgstr ""
#~ " (+|-)u . . . . (Do|Don't) strip a leading `_' from ids in strings.\n"
#~ " (+|-)s<cc> . . Allow <cc> in string ids, and (keep|ignore) those ids."
#~ msgstr ""
-#~ "Les paramčtre de l'analyseur lexical C prennent la forme -Sc<param>, oů "
+#~ "Les paramtre de l'analyseur lexical C prennent la forme -Sc<param>, o "
#~ "<param>\n"
-#~ "est l'un des suivants: (<cc> représente un ou plusieurs caractčres)\n"
-#~ " (+|-)u . . . . (Oui|Non) élimine les `_' au début d'un ids dans les "
-#~ "chaînes.\n"
-#~ " (+|-)s<cc> . . Autorise <cc> dans les chaînes ids, et (garde|ignore) ces "
+#~ "est l'un des suivants: (<cc> reprsente un ou plusieurs caractres)\n"
+#~ " (+|-)u . . . . (Oui|Non) limine les `_' au dbut d'un ids dans les "
+#~ "chanes.\n"
+#~ " (+|-)s<cc> . . Autorise <cc> dans les chanes ids, et (garde|ignore) ces "
#~ "ids.\n"
#~ " -v . . . . . . Saute les commentaires inutiles."
@@ -686,14 +707,15 @@ msgstr ""
#~ " (+|-)p . . . . (Do|Don't) handle C-preprocessor directives.\n"
#~ " (+|-)C . . . . (Do|Don't) handle C-style comments. (/* */)"
#~ msgstr ""
-#~ "Les paramčtres de l'analyseur lexical Assembleur prennent la forme "
-#~ "-Sasm<param>, oů\n"
-#~ "<param> est l'un des suivants: (<cc> représente un ou plusieurs caractčres)\n"
-#~ " -c<cc> . . . . <cc> marque un commentaire jusqu'ŕ la fin de la ligne.\n"
-#~ " (+|-)u . . . . (Oui|Non) élimine les `_' au dčbut de l'ids.\n"
+#~ "Les paramtres de l'analyseur lexical Assembleur prennent la forme -"
+#~ "Sasm<param>, o\n"
+#~ "<param> est l'un des suivants: (<cc> reprsente un ou plusieurs "
+#~ "caractres)\n"
+#~ " -c<cc> . . . . <cc> marque un commentaire jusqu' la fin de la ligne.\n"
+#~ " (+|-)u . . . . (Oui|Non) limine les `_' au dbut de l'ids.\n"
#~ " (+|-)a<cc> . . Autorise <cc> dans l'ids, et (garde|ignore) ces ids.\n"
-#~ " (+|-)p . . . . (Oui|Non) prend en compte les directives du preprocesseur "
-#~ "C.\n"
+#~ " (+|-)p . . . . (Oui|Non) prend en compte les directives du "
+#~ "preprocesseur C.\n"
#~ " (+|-)C . . . . (Oui|Non) Autorise les commentaires en style C. (/* */)"
#~ msgid "Usage: %s -S%s([(+|-)a<cc>] [(+|-)s<cc>]\n"
@@ -705,18 +727,19 @@ msgstr ""
#~ " (+|-)a<cc> . . Include (or exculde) <cc> in ids.\n"
#~ " (+|-)s<cc> . . Squeeze (or don't squeeze) <cc> out of ids."
#~ msgstr ""
-#~ "Les paramčtres de l'analyseur lexical texte prennent la forme -Stext<param>, "
-#~ "oů\n"
-#~ "<param> est l'un des suivants: (<cc> représente un ou plusieurs caractčres)\n"
+#~ "Les paramtres de l'analyseur lexical texte prennent la forme -"
+#~ "Stext<param>, o\n"
+#~ "<param> est l'un des suivants: (<cc> reprsente un ou plusieurs "
+#~ "caractres)\n"
#~ " (+|-)a<cc> . . Inclure (ou non) <cc> dans l'ids.\n"
-#~ " (+|-)s<cc> . . Réduire (ou non) <cc> de l'ids."
+#~ " (+|-)s<cc> . . Rduire (ou non) <cc> de l'ids."
#~ msgid "open"
#~ msgstr "ouvert"
#~ msgid ""
-#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-a<argfile>] "
-#~ "[-] [-u] [files...]\n"
+#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-"
+#~ "a<argfile>] [-] [-u] [files...]\n"
#~ "\t-v\t Verbose: print reports of progress\n"
#~ "\t-a<file> Open file for arguments\n"
#~ "\t-\t Read newline-separated args from stdin\n"
@@ -728,16 +751,16 @@ msgstr ""
#~ "\n"
#~ "Version %s; Made %s %s\n"
#~ msgstr ""
-#~ "Usage: %s [-v] [-f<idfichier>] [(+|-)l[<lang>]] [(+|-)S<chainerech>] "
-#~ "[-a<fichparam>] [-] [-u] [fichiers...]\n"
-#~ "\t-v\t Bavard: donne des indications sur le déroulement\n"
-#~ "\t-a<fichier> Ouvre <fichier> pour lecture paramčtres\n"
-#~ "\t-\t Lecture params séparés par un retour-chariot sur l'entrée standard\n"
-#~ "\t-l<lang> Force les fichiers recherchés ŕ <lang> jusqu'ŕ +l<lang>\n"
-#~ "\t-S<lang>-<param> Passe <param> ŕ l'analyseur lexical <lang>\n"
-#~ "\t-S.<suffix>=<lang> Analyse les fichiers .<suffix> comme étant <lang>\n"
+#~ "Usage: %s [-v] [-f<idfichier>] [(+|-)l[<lang>]] [(+|-)S<chainerech>] [-"
+#~ "a<fichparam>] [-] [-u] [fichiers...]\n"
+#~ "\t-v\t Bavard: donne des indications sur le droulement\n"
+#~ "\t-a<fichier> Ouvre <fichier> pour lecture paramtres\n"
+#~ "\t-\t Lecture params spars par un retour-chariot sur l'entre standard\n"
+#~ "\t-l<lang> Force les fichiers recherchs <lang> jusqu' +l<lang>\n"
+#~ "\t-S<lang>-<param> Passe <param> l'analyseur lexical <lang>\n"
+#~ "\t-S.<suffix>=<lang> Analyse les fichiers .<suffix> comme tant <lang>\n"
#~ "\t-S<lang>? Affiche la doc d'utilisation pour <lang>\n"
-#~ "\t-u\t Mise ŕ jour bases de données existantes (non implanté)\n"
+#~ "\t-u\t Mise jour bases de donnes existantes (non implant)\n"
#~ "\n"
#~ "Version %s; Faite %s %s\n"
@@ -748,21 +771,22 @@ msgstr ""
#~ msgstr "%s: Pas d'analyseur lexical pour ce langage: `%s'\n"
#~ msgid "create"
-#~ msgstr "crée"
+#~ msgstr "cre"
#~ msgid "malloc failure! \n"
-#~ msgstr "Échec malloc! \n"
+#~ msgstr "chec malloc! \n"
#, fuzzy
#~ msgid "Usage: %s [-f<file>] [-u<n>] [-r<dir>] [-mewdoxasknc] patterns...\n"
#~ msgstr ""
-#~ "Usage: %s [-f<fichier>] [-u<n>] [-r<repertoire>] [-mewdoxasknc] séquence...\n"
+#~ "Usage: %s [-f<fichier>] [-u<n>] [-r<repertoire>] [-mewdoxasknc] "
+#~ "squence...\n"
#~ msgid "%s: please use only one of -c or -r\n"
#~ msgstr "%s: utilisez soit -c soit -r\n"
#~ msgid "exec"
-#~ msgstr "exéc"
+#~ msgstr "exc"
#~ msgid "%s: Cannot %s `%s' (%s)\n"
#~ msgstr "%s: Impossible %s `%s' (%s)\n"
@@ -774,7 +798,7 @@ msgstr ""
#~ msgstr "Erreur de syntaxe avant ou sur %s\n"
#~ msgid "Out of memory in yylex"
-#~ msgstr "Débordement de mémoire dans yylex"
+#~ msgstr "Dbordement de mmoire dans yylex"
#~ msgid ""
#~ "iid: interactive ID database query tool. Call with:\n"
@@ -786,74 +810,74 @@ msgstr ""
#~ "\n"
#~ "To get help after starting program type 'help'.\n"
#~ msgstr ""
-#~ "iid: Outil interactif d'interrogation de base de données ID. Appeler par:\n"
+#~ "iid: Outil interactif d'interrogation de base de donnes ID. Appeler par:\n"
#~ " iid [-a] [-c] [-H]\n"
#~ "\n"
-#~ "-a\tExecute la commande d'interrogation par défaut 'aid' (et non 'lid').\n"
-#~ "-c cmd\tExécute <cmd> et stope.\n"
+#~ "-a\tExecute la commande d'interrogation par dfaut 'aid' (et non 'lid').\n"
+#~ "-c cmd\tExcute <cmd> et stope.\n"
#~ "-H\tAffiche ce message et stope.\n"
#~ "\n"
-#~ "Pour obtenir l'aide pendant l'exécution du programme, taper 'help'.\n"
+#~ "Pour obtenir l'aide pendant l'excution du programme, taper 'help'.\n"
#~ msgid "iid: Excess arguments ignored.\n"
-#~ msgstr "iid: paramčtres suplémentaires ignorés.\n"
+#~ msgstr "iid: paramtres suplmentaires ignors.\n"
#~ msgid "run iid -H for help.\n"
-#~ msgstr "exécuter iid -H pour l'aide.\n"
+#~ msgstr "excuter iid -H pour l'aide.\n"
#~ msgid "Fatal error: %s\n"
#~ msgstr "Erreur fatale: %s\n"
#~ msgid "No sets defined yet.\n"
-#~ msgstr "Pas d'ensembles définis encore.\n"
+#~ msgstr "Pas d'ensembles dfinis encore.\n"
#~ msgid "Out of memory in SetList"
-#~ msgstr "Débordement de mémoire dans SetList"
+#~ msgstr "Dbordement de mmoire dans SetList"
#~ msgid "Out of memory in InitList"
-#~ msgstr "Débordement de mémoire dans InitList"
+#~ msgstr "Dbordement de mmoire dans InitList"
#~ msgid "No memory for set in InitIid"
-#~ msgstr "Pas assez de mémoire pour l'ensemble dans InitIid"
+#~ msgstr "Pas assez de mmoire pour l'ensemble dans InitIid"
#~ msgid "No memory for symbol table entry in InstallFile"
#~ msgstr ""
-#~ "Pas assez de mémoire pour une entrée de la table des symboles dans "
+#~ "Pas assez de mmoire pour une entre de la table des symboles dans "
#~ "InstallFile"
#~ msgid "No memory for TheFiles in InstallFile"
-#~ msgstr "Pas assez de mémoire pour TheFiles dans InstallFile"
+#~ msgstr "Pas assez de mmoire pour TheFiles dans InstallFile"
#~ msgid "No memory for FileList in InstallFile"
-#~ msgstr "Pas assez de mémoire pour FileList dans InstallFile"
+#~ msgstr "Pas assez de mmoire pour FileList dans InstallFile"
#~ msgid "No memory for TheSets in AddSet"
-#~ msgstr "Pas assez de mémoire pour TheSets dans AddSet"
+#~ msgstr "Pas assez de mmoire pour TheSets dans AddSet"
#~ msgid "No memory for set in RunProg"
-#~ msgstr "Pas assez de mémoire pour l'ensemble dans RunProg"
+#~ msgstr "Pas assez de mmoire pour l'ensemble dans RunProg"
#~ msgid "No memory for set description in RunProg"
-#~ msgstr "Pas assez de mémoire pour le descripteur d'ensemble dans RunProg"
+#~ msgstr "Pas assez de mmoire pour le descripteur d'ensemble dans RunProg"
#~ msgid "Directory %s not accessible.\n"
#~ msgstr "Repertoire %s inaccessible.\n"
#~ msgid "No memory for set in SetIntersect"
-#~ msgstr "Pas assez de mémoire pour l'ensemble dans SetIntersect"
+#~ msgstr "Pas assez de mmoire pour l'ensemble dans SetIntersect"
#~ msgid "No memory for set description in SetIntersect"
#~ msgstr ""
-#~ "Pas assez de mémoire pour le descripteur d'ensemble dans SetIntersect"
+#~ "Pas assez de mmoire pour le descripteur d'ensemble dans SetIntersect"
#~ msgid "No memory for set in SetUnion"
-#~ msgstr "Pas assez de mémoire pour l'ensemble dans SetUnion"
+#~ msgstr "Pas assez de mmoire pour l'ensemble dans SetUnion"
#~ msgid "No memory for set description in SetUnion"
-#~ msgstr "Pas assez de mémoire pour le descripteur d'ensemble dans SetUnion"
+#~ msgstr "Pas assez de mmoire pour le descripteur d'ensemble dans SetUnion"
#~ msgid "No memory for set in SetInverse"
-#~ msgstr "Pas assez de mémoire pour l'ensemble dans SetInverse"
+#~ msgstr "Pas assez de mmoire pour l'ensemble dans SetInverse"
#~ msgid "No memory for set description in SetInverse"
-#~ msgstr "Pas assez de mémoire pour le descripteur d'ensemble dans SetInverse"
+#~ msgstr "Pas assez de mmoire pour le descripteur d'ensemble dans SetInverse"
diff --git a/po/nl.po b/po/nl.po
index d4d0fe6..015ba62 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: id-utils 3.2\n"
-"POT-Creation-Date: 2000-06-06 18:36+0200\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2005-10-06 13:04+0200\n"
"PO-Revision-Date: 1998-09-30 13:31+02:00\n"
"Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
"Language-Team: Dutch <nl@li.org>\n"
@@ -13,12 +14,18 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: libidu/fnprint.c:135
+#, fuzzy, c-format
+msgid "invalid `--separator' style: `%s'"
+msgstr "ongeldige `--key' stijl: `%s'"
+
#: libidu/hash.c:51
#, c-format
msgid "can't allocate %ld bytes for hash table: memory exhausted"
msgstr "kan geen %ld bytes voor frommeltabel reserveren: geheugen vol"
#: libidu/hash.c:264
+#, c-format
msgid "Load=%ld/%ld=%.0f%%, "
msgstr "Belasting=%ld/%ld=%.0f%%, "
@@ -28,82 +35,84 @@ msgid "Rehash=%d, "
msgstr "herverfrommeling=%d, "
#: libidu/hash.c:267
+#, c-format
msgid "Collisions=%ld/%ld=%.0f%%"
msgstr "Botsingen=%ld/%ld=%.0f%%"
-#: libidu/idfile.c:112
+#: libidu/idfile.c:104
msgid "can't determine the io_size of a string!"
msgstr "kan de io_size van een letterreeks niet vaststellen!"
-#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
+#: libidu/idread.c:49 src/mkid.c:454 src/xtokid.c:227
#, c-format
msgid "can't open `%s'"
msgstr "kan `%s' niet openen"
-#: libidu/idread.c:64
+#: libidu/idread.c:68
#, c-format
msgid "`%s' is not an ID file! (bad magic #)"
msgstr "`%s' is geen ID bestand! (fout magisch nummer)"
-#: libidu/idread.c:66
+#: libidu/idread.c:70
#, c-format
msgid "`%s' is version %d, but I only grok version %d"
msgstr "`%s' is versie %d, maar ik lust alleen versie %d"
-#: libidu/idread.c:186
+#: libidu/idread.c:190
#, c-format
msgid "unsupported size in io_read (): %d"
msgstr "niet-ondersteunde afmeting in io_read(): %d"
-#: libidu/idread.c:194 libidu/idwrite.c:167
+#: libidu/idread.c:198 libidu/idwrite.c:168
#, c-format
msgid "unknown I/O type: %d"
msgstr "onbekend I/O type: %d"
-#: libidu/idwrite.c:156
+#: libidu/idwrite.c:157
#, c-format
msgid "unsupported size in io_write (): %d"
msgstr "niet-ondersteunde afmeting in io_write(): %d"
-#: libidu/scanners.c:102
+#: libidu/scanners.c:93
#, c-format
msgid "unrecognized language: `%s'"
msgstr "niet herkende taal: `%s'"
-#: libidu/scanners.c:148
+#: libidu/scanners.c:139
msgid "can't allocate language args obstack: memory exhausted"
msgstr "kan geen objectstapel voor taalargumenten vrijmaken: geheugen vol"
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:193 libidu/scanners.c:262
msgid "can't allocate language args: memory exhausted"
msgstr "kan geen geheugen vrijmaken voor taalargumenten: geheugen vol"
-#: libidu/scanners.c:210
+#: libidu/scanners.c:201
#, c-format
msgid "language name expected following `%s' in file `%s'"
msgstr "taalnaam verwacht na `%s' in bestand `%s'"
-#: libidu/scanners.c:265
+#: libidu/scanners.c:256
#, c-format
msgid "can't open language map file `%s'"
msgstr "kan taalbestand `%s' niet openen"
-#: libidu/scanners.c:267
+#: libidu/scanners.c:258
#, c-format
msgid "can't get size of map file `%s'"
msgstr "kan grootte van mapbestand `%s' niet krijgen"
-#: libidu/scanners.c:277
+#: libidu/scanners.c:268
#, c-format
msgid "can't read language map file `%s'"
msgstr "kan taalbestand `%s' niet lezen"
-#: libidu/scanners.c:280
+#: libidu/scanners.c:271
#, c-format
msgid "can't read entire language map file `%s'"
msgstr "kan niet het hele taalbestand `%s' lezen"
-#: libidu/scanners.c:425
+#: libidu/scanners.c:416
+#, c-format
msgid ""
"C language:\n"
" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
@@ -121,17 +130,18 @@ msgstr ""
" -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
" weg van reeksen van een eenheid\n"
-#: libidu/scanners.c:708 libidu/scanners.c:979 libidu/scanners.c:1182
+#: libidu/scanners.c:699 libidu/scanners.c:970 libidu/scanners.c:1173
#, c-format
msgid "junk: `%c'"
msgstr "onzin: `%c'"
-#: libidu/scanners.c:710 libidu/scanners.c:981 libidu/scanners.c:1184
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
#, c-format
msgid "junk: `\\%03o'"
msgstr "onzin: `\\%03o'"
-#: libidu/scanners.c:814
+#: libidu/scanners.c:805
+#, c-format
msgid ""
"Assembly language:\n"
" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
@@ -149,7 +159,8 @@ msgstr ""
"eenheden\n"
" -n,--no-cpp Behandel geen C pre-processor aanwijzingen\n"
-#: libidu/scanners.c:1085
+#: libidu/scanners.c:1076
+#, c-format
msgid ""
"Text language:\n"
" -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token "
@@ -163,119 +174,127 @@ msgstr ""
" -x,--exclude=TEKEN-KLASSE Behandel tekens van TEKEN-KLASSE als "
"eenheidscheiding\n"
-#: libidu/walker.c:114
+#: libidu/walker.c:111
#, c-format
msgid "can't read directory `%s' (`.' from `%s')"
msgstr "kan map `%s' niet lezen (`.' van `%s')"
-#: libidu/walker.c:181
+#: libidu/walker.c:178
#, c-format
msgid "notice: `%s' was a %s, but is now a %s!"
msgstr "opmerking: `%s' was een %s, maar is nu een %s!"
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "file"
msgstr "bestand"
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "directory"
msgstr "map"
-#: libidu/walker.c:306
+#: libidu/walker.c:303
#, c-format
msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
msgstr ""
"waarschuwing: `%s' en `%s' zijn het zelfde bestand, maar leveren "
"verschillende resultaten op!"
-#: libidu/walker.c:400
+#: libidu/walker.c:397
#, c-format
msgid "notice: scan parameters changed for `%s'"
msgstr "opmerking: leesparameters veranderd voor `%s'"
-#: libidu/walker.c:604
+#: libidu/walker.c:600
msgid "can't get working directory"
msgstr "kan huidige map niet verkrijgen"
-#: libidu/walker.c:661
+#: libidu/walker.c:657
#, c-format
msgid "can't chdir to `%s'"
msgstr "kan niet naar map `%s' gaan"
-#: libidu/walker.c:666
+#: libidu/walker.c:662
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr "kan niet van map `%s' naar `%s' gaan"
-#: libidu/walker.c:727
+#: libidu/walker.c:723
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr "kan de status van de link `%s' niet opvragen vanuit `%s'"
-#: libidu/walker.c:735
+#: libidu/walker.c:731
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr "kan de status van `%s' niet opvragen vanuit `%s'"
-#: lib/getopt.c:527
+#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s: optie `%s' is dubbelzinnig\n"
-#: lib/getopt.c:550
+#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr "%s: optie `--%s' staat geen argumenten toe\n"
-#: lib/getopt.c:555
+#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: optie `%c%s' staat geen argumenten toe\n"
-#: lib/getopt.c:570
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: optie `%s' vereist een argument\n"
-#. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s: onbekende optie `--%s'\n"
-#. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s: onbekende optie `%c%s'\n"
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:627
+#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s: ongeldige optie -- %c\n"
-#: lib/getopt.c:630
+#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s: ongeldige optie -- %c\n"
-#: lib/getopt.c:666
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: optie vereist een argument -- %c\n"
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
+#: lib/getopt.c:935 lib/getopt.c:954
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: optie `%s' is dubbelzinnig\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: optie `--%s' staat geen argumenten toe\n"
+
+#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:123 src/xtokid.c:47
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/fid.c:78
+#: src/fid.c:81
#, c-format
msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
msgstr "Aanroep: %s [OPTIE] BESTANDSNAAM [BESTANDSNAAM2]\n"
-#: src/fid.c:81
+#: src/fid.c:84
+#, c-format
msgid ""
"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
"also given list the identifiers that occur in both files.\n"
@@ -292,34 +311,35 @@ msgstr ""
" --help geef deze hulp en beëindig\n"
" --version geef versie informatie en beëindig\n"
-#: src/fid.c:141
+#: src/fid.c:147
msgid "no file name arguments"
msgstr "geen bestandsnaam argumenten"
-#: src/fid.c:146
+#: src/fid.c:152
msgid "too many file name arguments"
msgstr "te veel bestandsnaam argumenten"
-#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
+#: src/fid.c:159 src/fnid.c:154 src/lid.c:413
msgid "can't locate `ID'"
msgstr "kan `ID' niet vinden"
-#: src/fid.c:235
+#: src/fid.c:241
#, c-format
msgid "`%s' is ambiguous"
msgstr "`%s' is dubbelzinnig"
-#: src/fid.c:241
+#: src/fid.c:247
#, c-format
msgid "`%s' not found"
msgstr "`%s' niet gevonden"
-#: src/fnid.c:66
+#: src/fnid.c:70
#, c-format
msgid "Usage: %s [OPTION]... [PATTERN]...\n"
msgstr "Aanroep: %s [OPTIE]... [PATROON]...\n"
-#: src/fnid.c:70
+#: src/fnid.c:74
+#, c-format
msgid ""
"Print constituent file names that match PATTERN,\n"
"using shell-style wildcards.\n"
@@ -336,12 +356,12 @@ msgstr ""
" --help geef deze hulp en beëindig\n"
" --version geef versie informatie en beëindig\n"
-#: src/lid.c:241
+#: src/lid.c:245
#, c-format
msgid "Usage: %s [OPTION]... PATTERN...\n"
msgstr "Aanroep: %s [OPTIE]... PATROON...\n"
-#: src/lid.c:245
+#: src/lid.c:249
#, c-format
msgid ""
"Query ID database and report results.\n"
@@ -364,8 +384,8 @@ msgid ""
" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
"`none'\n"
" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
+" only applies to file names when `--"
+"result=filenames'\n"
" The above STYLE options control how query results are "
"presented.\n"
" Defaults are --key=token --result=filenames --separator=%s\n"
@@ -405,8 +425,8 @@ msgstr ""
" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
"`none'\n"
" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
+" only applies to file names when `--"
+"result=filenames'\n"
" The above STYLE options control how query results are "
"presented.\n"
" Defaults are --key=token --result=filenames --separator=%s\n"
@@ -426,65 +446,66 @@ msgstr ""
" --help display this help and exit\n"
" --version output version information and exit\n"
-#: src/lid.c:281
+#: src/lid.c:285
msgid "braces"
msgstr "accolades"
-#: src/lid.c:281
+#: src/lid.c:285
msgid "space"
msgstr "spatie"
-#: src/lid.c:347
+#: src/lid.c:353
msgid "notice: use of `-e' is deprecated, use `-r' instead"
msgstr ""
"opmerking: gebruik van `-e' is verouderd, gebruik `-r' in plaats daarvan"
-#: src/lid.c:428
+#: src/lid.c:434
#, c-format
msgid "All identifiers are non-ambiguous within the first %d characters\n"
msgstr ""
"Alle namen van variabelen zijn niet dubbelzinnig in de eerste %d tekens\n"
-#: src/lid.c:463
+#: src/lid.c:469
#, c-format
msgid "invalid `--key' style: `%s'"
msgstr "ongeldige `--key' stijl: `%s'"
-#: src/lid.c:475
+#: src/lid.c:481
#, c-format
msgid "invalid `--result' style: `%s'"
msgstr "ongeldige `--result' stijl: `%s'"
-#. FIXME: i18n of responses
-#: src/lid.c:632
+#: src/lid.c:638
+#, c-format
msgid "edit? [y1-9^S/nq] "
msgstr "bewerken? [j1-9^S/nq]"
-#: src/lid.c:701
+#: src/lid.c:707
msgid "can't fork"
msgstr "kan geen nieuw proces beginnen"
-#: src/lid.c:719
+#: src/lid.c:725
#, c-format
msgid "can't exec `%s'"
msgstr "kan `%s' niet uitvoeren"
-#: src/lid.c:860
+#: src/lid.c:866
msgid "can't match regular-expression: memory exhausted"
msgstr "kan reguliere expressie niet vergelijken: geheugen vol"
-#: src/mkid.c:147 src/xtokid.c:64
+#: src/mkid.c:148 src/xtokid.c:68
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr "Aanroep: %s [OPTIE]... [BESTAND]...\n"
-#: src/mkid.c:151
+#: src/mkid.c:152
+#, c-format
msgid ""
"Build an identifier database.\n"
" -o, --output=OUTFILE file name of ID database output\n"
" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -506,8 +527,8 @@ msgstr ""
"Maak een namendatabase aan\n"
" -o, --output=UITBESTAND bestandsnaam van databaseuitvoer\n"
" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -526,109 +547,112 @@ msgstr ""
"\n"
"The following arguments apply to the language-specific scanners:\n"
-#: src/mkid.c:357
+#: src/mkid.c:360
#, c-format
msgid "can't create `%s' in `%s'"
msgstr "kan `%s' niet aanmaken in `%s'"
-#: src/mkid.c:361
+#: src/mkid.c:364
#, c-format
msgid "can't modify `%s'"
msgstr "kan `%s' niet veranderen"
-#: src/mkid.c:434
+#: src/mkid.c:437
#, c-format
msgid "can't stat `%s'"
msgstr "kan de status van `%s' niet opvragen"
-#: src/mkid.c:503
+#: src/mkid.c:506
#, c-format
msgid " new = %d/%d"
msgstr " nieuw = %d/%d"
-#: src/mkid.c:512
+#: src/mkid.c:515
#, c-format
msgid "Name=%ld, "
msgstr "Naam=%ld, "
-#: src/mkid.c:513
+#: src/mkid.c:516
#, c-format
msgid "Number=%ld, "
msgstr "Nummer = %ld, "
-#: src/mkid.c:514
+#: src/mkid.c:517
#, c-format
msgid "String=%ld, "
msgstr "Letterreeks=%ld, "
-#: src/mkid.c:515
+#: src/mkid.c:518
#, c-format
msgid "Literal=%ld, "
msgstr "Letterlijk=%ld, "
-#: src/mkid.c:516
+#: src/mkid.c:519
#, c-format
msgid "Comment=%ld\n"
msgstr "Commentaar=%ld\n"
-#: src/mkid.c:518
+#: src/mkid.c:521
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Bestanden=%d, "
-#: src/mkid.c:519
+#: src/mkid.c:522
#, c-format
msgid "Tokens=%ld, "
msgstr "Eenheden=%ld, "
-#: src/mkid.c:520
+#: src/mkid.c:523
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bytes=%ld Kb, "
-#: src/mkid.c:521
+#: src/mkid.c:524
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "Data=%ld+%ld Kb, "
-#: src/mkid.c:523
+#: src/mkid.c:526
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Uitvoer=%ld (%ld eenheden, %ld gevonden)\n"
-#: src/mkid.c:526
+#: src/mkid.c:529
#, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr ", Freq=%ld/%ld=%.2f\n"
-#: src/mkid.c:550
+#: src/mkid.c:553
+#, c-format
msgid "Sorting tokens...\n"
msgstr "Eenheden sorteren...\n"
-#: src/mkid.c:556
+#: src/mkid.c:559
#, c-format
msgid "Writing `%s'...\n"
msgstr "`%s' schrijven...\n"
-#: src/mkid.c:559
+#: src/mkid.c:562
#, c-format
msgid "can't create `%s'"
msgstr "kan `%s' niet aanmaken"
-#: src/mkid.c:626
+#: src/mkid.c:629
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:714
+#: src/mkid.c:717
+#, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "niveau %d: %ld/%ld = %.0f%%\n"
-#: src/xtokid.c:68
+#: src/xtokid.c:72
+#, c-format
msgid ""
"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -641,8 +665,8 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -653,11 +677,3 @@ msgstr ""
" --version output version information and exit\n"
"\n"
"The following arguments apply to the language-specific scanners:\n"
-
-#, fuzzy
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: optie `%s' is dubbelzinnig\n"
-
-#, fuzzy
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `--%s' staat geen argumenten toe\n"
diff --git a/po/pl.po b/po/pl.po
index 51a325f..188f905 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: id-utils 3.0.8\n"
-"POT-Creation-Date: 2000-06-06 18:36+0200\n"
+"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
+"POT-Creation-Date: 2005-10-06 13:04+0200\n"
"PO-Revision-Date: 1997-03-26 23:59 +0100\n"
"Last-Translator: Wojciech Marek Gałązka <wgalazka@chem.uw.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -13,13 +14,18 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: libidu/fnprint.c:135
+#, c-format
+msgid "invalid `--separator' style: `%s'"
+msgstr ""
+
#: libidu/hash.c:51
#, c-format
msgid "can't allocate %ld bytes for hash table: memory exhausted"
msgstr ""
#: libidu/hash.c:264
-#, fuzzy
+#, fuzzy, c-format
msgid "Load=%ld/%ld=%.0f%%, "
msgstr "Obciążenie=%ld/%ld=%.2f, "
@@ -29,83 +35,84 @@ msgid "Rehash=%d, "
msgstr "Ponownie mieszanie=%d, "
#: libidu/hash.c:267
-#, fuzzy
+#, fuzzy, c-format
msgid "Collisions=%ld/%ld=%.0f%%"
msgstr "Próby=%ld/%ld=%.2f, "
-#: libidu/idfile.c:112
+#: libidu/idfile.c:104
msgid "can't determine the io_size of a string!"
msgstr ""
-#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
+#: libidu/idread.c:49 src/mkid.c:454 src/xtokid.c:227
#, c-format
msgid "can't open `%s'"
msgstr ""
-#: libidu/idread.c:64
+#: libidu/idread.c:68
#, c-format
msgid "`%s' is not an ID file! (bad magic #)"
msgstr ""
-#: libidu/idread.c:66
+#: libidu/idread.c:70
#, c-format
msgid "`%s' is version %d, but I only grok version %d"
msgstr ""
-#: libidu/idread.c:186
+#: libidu/idread.c:190
#, fuzzy, c-format
msgid "unsupported size in io_read (): %d"
msgstr "Nie obsługiwany rozmiar w io_write (): %d\n"
-#: libidu/idread.c:194 libidu/idwrite.c:167
+#: libidu/idread.c:198 libidu/idwrite.c:168
#, c-format
msgid "unknown I/O type: %d"
msgstr ""
-#: libidu/idwrite.c:156
+#: libidu/idwrite.c:157
#, fuzzy, c-format
msgid "unsupported size in io_write (): %d"
msgstr "Nie obsługiwany rozmiar w io_write (): %d\n"
-#: libidu/scanners.c:102
+#: libidu/scanners.c:93
#, fuzzy, c-format
msgid "unrecognized language: `%s'"
msgstr "Brak skanera dla języka `%s'\n"
-#: libidu/scanners.c:148
+#: libidu/scanners.c:139
msgid "can't allocate language args obstack: memory exhausted"
msgstr ""
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:193 libidu/scanners.c:262
msgid "can't allocate language args: memory exhausted"
msgstr ""
-#: libidu/scanners.c:210
+#: libidu/scanners.c:201
#, c-format
msgid "language name expected following `%s' in file `%s'"
msgstr ""
-#: libidu/scanners.c:265
+#: libidu/scanners.c:256
#, fuzzy, c-format
msgid "can't open language map file `%s'"
msgstr "Brak skanera dla języka `%s'\n"
-#: libidu/scanners.c:267
+#: libidu/scanners.c:258
#, c-format
msgid "can't get size of map file `%s'"
msgstr ""
-#: libidu/scanners.c:277
+#: libidu/scanners.c:268
#, fuzzy, c-format
msgid "can't read language map file `%s'"
msgstr "Brak skanera dla języka `%s'\n"
-#: libidu/scanners.c:280
+#: libidu/scanners.c:271
#, c-format
msgid "can't read entire language map file `%s'"
msgstr ""
-#: libidu/scanners.c:425
+#: libidu/scanners.c:416
+#, c-format
msgid ""
"C language:\n"
" -k,--keep=CHARS Allow CHARS in single-token strings, keep the "
@@ -116,17 +123,18 @@ msgid ""
"strings\n"
msgstr ""
-#: libidu/scanners.c:708 libidu/scanners.c:979 libidu/scanners.c:1182
+#: libidu/scanners.c:699 libidu/scanners.c:970 libidu/scanners.c:1173
#, c-format
msgid "junk: `%c'"
msgstr "śmieć: `%c'"
-#: libidu/scanners.c:710 libidu/scanners.c:981 libidu/scanners.c:1184
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
#, c-format
msgid "junk: `\\%03o'"
msgstr "śmieć: `\\%03o'"
-#: libidu/scanners.c:814
+#: libidu/scanners.c:805
+#, c-format
msgid ""
"Assembly language:\n"
" -c,--comment=CHARS Any of CHARS starts a comment until end-of-line\n"
@@ -136,7 +144,8 @@ msgid ""
" -n,--no-cpp Don't handle C pre-processor directives\n"
msgstr ""
-#: libidu/scanners.c:1085
+#: libidu/scanners.c:1076
+#, c-format
msgid ""
"Text language:\n"
" -i,--include=CHAR-CLASS Treat characters of CHAR-CLASS as token "
@@ -145,118 +154,126 @@ msgid ""
"delimiters\n"
msgstr ""
-#: libidu/walker.c:114
+#: libidu/walker.c:111
#, c-format
msgid "can't read directory `%s' (`.' from `%s')"
msgstr ""
-#: libidu/walker.c:181
+#: libidu/walker.c:178
#, c-format
msgid "notice: `%s' was a %s, but is now a %s!"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "file"
msgstr ""
-#: libidu/walker.c:182 libidu/walker.c:183
+#: libidu/walker.c:179 libidu/walker.c:180
msgid "directory"
msgstr ""
-#: libidu/walker.c:306
+#: libidu/walker.c:303
#, c-format
msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
msgstr ""
-#: libidu/walker.c:400
+#: libidu/walker.c:397
#, c-format
msgid "notice: scan parameters changed for `%s'"
msgstr ""
-#: libidu/walker.c:604
+#: libidu/walker.c:600
#, fuzzy
msgid "can't get working directory"
msgstr "%s: nie mogę pobrać nazwy bieżącego katalogu.\n"
-#: libidu/walker.c:661
+#: libidu/walker.c:657
#, c-format
msgid "can't chdir to `%s'"
msgstr ""
-#: libidu/walker.c:666
+#: libidu/walker.c:662
#, c-format
msgid "can't chdir to `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:727
+#: libidu/walker.c:723
#, c-format
msgid "can't lstat `%s' from `%s'"
msgstr ""
-#: libidu/walker.c:735
+#: libidu/walker.c:731
#, c-format
msgid "can't stat `%s' from `%s'"
msgstr ""
-#: lib/getopt.c:527
+#: lib/getopt.c:551 lib/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr ""
-#: lib/getopt.c:550
+#: lib/getopt.c:603 lib/getopt.c:607
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:555
+#: lib/getopt.c:616 lib/getopt.c:621
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr ""
-#: lib/getopt.c:570
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr ""
-#. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:727 lib/getopt.c:730
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
-#. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:738 lib/getopt.c:741
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr ""
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:627
+#: lib/getopt.c:796 lib/getopt.c:799
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: lib/getopt.c:630
+#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr ""
-#: lib/getopt.c:666
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/fid.c:73 src/fnid.c:53 src/lid.c:237 src/mkid.c:123 src/xtokid.c:47
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/fid.c:78
+#: src/fid.c:81
#, c-format
msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
msgstr ""
-#: src/fid.c:81
+#: src/fid.c:84
+#, c-format
msgid ""
"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
"also given list the identifiers that occur in both files.\n"
@@ -266,34 +283,35 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/fid.c:141
+#: src/fid.c:147
msgid "no file name arguments"
msgstr ""
-#: src/fid.c:146
+#: src/fid.c:152
msgid "too many file name arguments"
msgstr ""
-#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
+#: src/fid.c:159 src/fnid.c:154 src/lid.c:413
msgid "can't locate `ID'"
msgstr ""
-#: src/fid.c:235
+#: src/fid.c:241
#, c-format
msgid "`%s' is ambiguous"
msgstr ""
-#: src/fid.c:241
+#: src/fid.c:247
#, fuzzy, c-format
msgid "`%s' not found"
msgstr "%s: nie odnaleziony\n"
-#: src/fnid.c:66
+#: src/fnid.c:70
#, c-format
msgid "Usage: %s [OPTION]... [PATTERN]...\n"
msgstr ""
-#: src/fnid.c:70
+#: src/fnid.c:74
+#, c-format
msgid ""
"Print constituent file names that match PATTERN,\n"
"using shell-style wildcards.\n"
@@ -303,12 +321,12 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:241
+#: src/lid.c:245
#, c-format
msgid "Usage: %s [OPTION]... PATTERN...\n"
msgstr ""
-#: src/lid.c:245
+#: src/lid.c:249
#, c-format
msgid ""
"Query ID database and report results.\n"
@@ -331,8 +349,8 @@ msgid ""
" -R, --result=STYLE STYLE is one of `filenames', `grep', `edit' or "
"`none'\n"
" -S, --separator=STYLE STYLE is one of `braces', `space' or `newline' and\n"
-" only applies to file names when "
-"`--result=filenames'\n"
+" only applies to file names when `--"
+"result=filenames'\n"
" The above STYLE options control how query results are "
"presented.\n"
" Defaults are --key=token --result=filenames --separator=%s\n"
@@ -353,64 +371,64 @@ msgid ""
" --version output version information and exit\n"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "braces"
msgstr ""
-#: src/lid.c:281
+#: src/lid.c:285
msgid "space"
msgstr ""
-#: src/lid.c:347
+#: src/lid.c:353
msgid "notice: use of `-e' is deprecated, use `-r' instead"
msgstr ""
-#: src/lid.c:428
+#: src/lid.c:434
#, fuzzy, c-format
msgid "All identifiers are non-ambiguous within the first %d characters\n"
msgstr "Identyfikatory są jednoznaczne w zakresie pierwszych %d znaków\n"
-#: src/lid.c:463
+#: src/lid.c:469
#, c-format
msgid "invalid `--key' style: `%s'"
msgstr ""
-#: src/lid.c:475
+#: src/lid.c:481
#, c-format
msgid "invalid `--result' style: `%s'"
msgstr ""
-#. FIXME: i18n of responses
-#: src/lid.c:632
-#, fuzzy
+#: src/lid.c:638
+#, fuzzy, c-format
msgid "edit? [y1-9^S/nq] "
msgstr "Edytować? [y1-9^S/nq] "
-#: src/lid.c:701
+#: src/lid.c:707
msgid "can't fork"
msgstr ""
-#: src/lid.c:719
+#: src/lid.c:725
#, c-format
msgid "can't exec `%s'"
msgstr ""
-#: src/lid.c:860
+#: src/lid.c:866
msgid "can't match regular-expression: memory exhausted"
msgstr ""
-#: src/mkid.c:147 src/xtokid.c:64
+#: src/mkid.c:148 src/xtokid.c:68
#, c-format
msgid "Usage: %s [OPTION]... [FILE]...\n"
msgstr ""
-#: src/mkid.c:151
+#: src/mkid.c:152
+#, c-format
msgid ""
"Build an identifier database.\n"
" -o, --output=OUTFILE file name of ID database output\n"
" -f, --file=OUTFILE synonym for --output\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -430,110 +448,112 @@ msgid ""
"The following arguments apply to the language-specific scanners:\n"
msgstr ""
-#: src/mkid.c:357
+#: src/mkid.c:360
#, c-format
msgid "can't create `%s' in `%s'"
msgstr ""
-#: src/mkid.c:361
+#: src/mkid.c:364
#, c-format
msgid "can't modify `%s'"
msgstr ""
-#: src/mkid.c:434
+#: src/mkid.c:437
#, c-format
msgid "can't stat `%s'"
msgstr ""
-#: src/mkid.c:503
+#: src/mkid.c:506
#, fuzzy, c-format
msgid " new = %d/%d"
msgstr ", nowy=%d/%d"
-#: src/mkid.c:512
+#: src/mkid.c:515
#, c-format
msgid "Name=%ld, "
msgstr "Nazwa=%ld, "
-#: src/mkid.c:513
+#: src/mkid.c:516
#, c-format
msgid "Number=%ld, "
msgstr "Numer=%ld, "
-#: src/mkid.c:514
+#: src/mkid.c:517
#, c-format
msgid "String=%ld, "
msgstr "Łańcuch=%ld, "
-#: src/mkid.c:515
+#: src/mkid.c:518
#, c-format
msgid "Literal=%ld, "
msgstr "Literał=%ld, "
-#: src/mkid.c:516
+#: src/mkid.c:519
#, c-format
msgid "Comment=%ld\n"
msgstr "Komentarz=%ld\n"
-#: src/mkid.c:518
+#: src/mkid.c:521
#, fuzzy, c-format
msgid "Files=%ld, "
msgstr "Pliki=%d, "
-#: src/mkid.c:519
+#: src/mkid.c:522
#, c-format
msgid "Tokens=%ld, "
msgstr "Znaczniki=%ld, "
-#: src/mkid.c:520
+#: src/mkid.c:523
#, c-format
msgid "Bytes=%ld Kb, "
msgstr "Bajty=%ld Kb, "
-#: src/mkid.c:521
+#: src/mkid.c:524
#, fuzzy, c-format
msgid "Heap=%d+%d Kb, "
msgstr "Sterta=%ld Kb, "
-#: src/mkid.c:523
+#: src/mkid.c:526
#, c-format
msgid "Output=%ld (%ld tok, %ld hit)\n"
msgstr "Wynik=%ld (%ld tok, %ld hit)\n"
-#: src/mkid.c:526
+#: src/mkid.c:529
#, fuzzy, c-format
msgid ", Freq=%ld/%ld=%.2f\n"
msgstr "Częstość=%ld/%ld=%.2f\n"
-#: src/mkid.c:550
+#: src/mkid.c:553
+#, c-format
msgid "Sorting tokens...\n"
msgstr "Sortowanie znaczników...\n"
-#: src/mkid.c:556
+#: src/mkid.c:559
#, c-format
msgid "Writing `%s'...\n"
msgstr "Zapisuję `%s'...\n"
-#: src/mkid.c:559
+#: src/mkid.c:562
#, c-format
msgid "can't create `%s'"
msgstr ""
-#: src/mkid.c:626
+#: src/mkid.c:629
#, c-format
msgid "error closing `%s'"
msgstr ""
-#: src/mkid.c:714
-#, fuzzy
+#: src/mkid.c:717
+#, fuzzy, c-format
msgid "level %d: %ld/%ld = %.0f%%\n"
msgstr "poziom %d: %ld == %ld\n"
-#: src/xtokid.c:68
+#: src/xtokid.c:72
+#, c-format
msgid ""
"Print all tokens found in a source file.\n"
-" -i, --include=LANGS include languages in LANGS (default: \"C C++ "
-"asm\")\n"
+" -i, --include=LANGS include languages in LANGS (default: \"C C++ asm"
+"\")\n"
" -x, --exclude=LANGS exclude languages in LANGS\n"
" -l, --lang-option=L:OPT pass OPT as a default for language L (see below)\n"
" -m, --lang-map=MAPFILE use MAPFILE to map file names onto source "
@@ -675,8 +695,8 @@ msgstr ""
#~ msgstr "%s: Nie mogę %s `%s' (%s)\n"
#~ msgid ""
-#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-a<argfile>] "
-#~ "[-] [-u] [files...]\n"
+#~ "Usage: %s [-v] [-f<idfile>] [(+|-)l[<lang>]] [(+|-)S<scanarg>] [-"
+#~ "a<argfile>] [-] [-u] [files...]\n"
#~ "\t-v\t Verbose: print reports of progress\n"
#~ "\t-a<file> Open file for arguments\n"
#~ "\t-\t Read newline-separated args from stdin\n"
@@ -688,8 +708,8 @@ msgstr ""
#~ "\n"
#~ "Version %s; Made %s %s\n"
#~ msgstr ""
-#~ "Użycie: %s [-v] [-f<plikID>] [(+|-)l[<język>]] [(+|-)S<arg>] [-a<plik arg>] "
-#~ "[-] [-u] [pliki...]\n"
+#~ "Użycie: %s [-v] [-f<plikID>] [(+|-)l[<język>]] [(+|-)S<arg>] [-a<plik "
+#~ "arg>] [-] [-u] [pliki...]\n"
#~ "\t-v\t Wszystko: wyświetlaj raporty postepu\n"
#~ "\t-a<plik> Pobierz argumenty z pliku \n"
#~ "\t-\t Czytaj ze std. wejścia argumenty oddzielone znakiem nowej linii\n"
@@ -768,11 +788,11 @@ msgstr ""
#~ msgstr "%s: Note: `%s/%s' zastępuje `%s/%s'\n"
#~ msgid ""
-#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] "
-#~ "[-S<lang>/<lang>/<filter>]\n"
+#~ "Usage: %s [-S<suffix>=<lang>] [+S(+|-)<arg>] [-S<lang>(+|-)<arg>] [-"
+#~ "S<lang>/<lang>/<filter>]\n"
#~ msgstr ""
-#~ "Użycie: %s [-S<rozsz>=<język>] [+S(+|-)<arg>] [-S<język>(+|-)<arg>] "
-#~ "[-S<język>/<język>/<filtr>]\n"
+#~ "Użycie: %s [-S<rozsz>=<język>] [+S(+|-)<arg>] [-S<język>(+|-)<arg>] [-"
+#~ "S<język>/<język>/<filtr>]\n"
#~ msgid "junk: `\\%3o'"
#~ msgstr "śmieć: `\\%3o'"
@@ -791,8 +811,8 @@ msgstr ""
#~ "jest jednym z następujących: (<zn> oznacza jeden lub więcej znaków)\n"
#~ " (+|-)u . . . . (Tak|Nie) usuń poprzedzający '_' z identyfikatorów w "
#~ "łańcuchach.\n"
-#~ " (+|-)s<zn> . . Pozwól na obecność <zn> in identyfikatorach łańcuchowych, i "
-#~ "(zatrzymaj|pomiń) te identyfikatory.\n"
+#~ " (+|-)s<zn> . . Pozwól na obecność <zn> in identyfikatorach "
+#~ "łańcuchowych, i (zatrzymaj|pomiń) te identyfikatory.\n"
#~ " -v . . . . . . Pomiń komentarze."
#~ msgid "Usage: %s -S%s([-c<cc>] [-u] [(+|-)a<cc>] [(+|-)p] [(+|-)C])\n"
@@ -811,8 +831,8 @@ msgstr ""
#~ "jest jednym z następujących: (<zn> oznacza jeden lub więcej znaków)\n"
#~ " -c<zn> . . . . <zn> wprowadzaja komentarz do końca linii.\n"
#~ " (+|-)u . . . . (Tak|Nie) usuń poprzedzający '_' z identyfikatorów. \n"
-#~ " (+|-)a<zn> . . Pozwól na obecność <zn> in identyfikatorach i "
-#~ "(pozostaw|pomiń) te identyfikatory.\n"
+#~ " (+|-)a<zn> . . Pozwól na obecność <zn> in identyfikatorach i (pozostaw|"
+#~ "pomiń) te identyfikatory.\n"
#~ " (+|-)p . . . . (Tak|Nie) rozpoznawaj dyrektywy preprocesora C.\n"
#~ " (+|-)C . . . . (Tak|Nie) rozpoznawaj kometarze w stylu C (/* */)"