.

13 files changed, 944 insertions, 468 deletions

diff --git a/ChangeLog b/ChangeLog
index c5378cd..70cb922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+1999-04-10  Greg McGary  <gkm@gnu.org>
+
+	* walker.c (classify_link): Only return 0 for zero-length files.
+	Keep directories, no matter what their size.  DOS always
+	returns zero size for directories.
+	[From tbisp@uswest.net]
+
 1999-04-09  Greg McGary  <gkm@gnu.org>
 
 	* po/Makefile.in.in (DISTFILES): Remove ChangeLog.
-	* po/ChangeLog: Remove empty file.w
+	* po/ChangeLog: Remove empty file.
 
 1999-04-08  Greg McGary  <gkm@gnu.org>
 
diff --git a/Makefile.in b/Makefile.in
index 6da3099..fbbced7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6fd5f64..cb99203 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index b9a7888..3b679b9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -126,8 +127,9 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in alloca.c basename.c dirname.c \
-error.c fnmatch.c memcpy.c memset.c obstack.c obstack.h regex.c \
-strcspn.c strdup.c strndup.c strpbrk.c strspn.c strstr.c strtok.c
+error.c fnmatch.c malloc.c memcpy.c memset.c obstack.c obstack.h \
+regex.c strcspn.c strdup.c strndup.c strpbrk.c strspn.c strstr.c \
+strtok.c
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -136,10 +138,10 @@ TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/alloca.P .deps/basename.P .deps/dirname.P \
 .deps/error.P .deps/fnmatch.P .deps/getopt.P .deps/getopt1.P \
-.deps/memcpy.P .deps/memset.P .deps/obstack.P .deps/regex.P \
-.deps/strcspn.P .deps/strdup.P .deps/strndup.P .deps/strpbrk.P \
-.deps/strspn.P .deps/strstr.P .deps/strtok.P .deps/xgetcwd.P \
-.deps/xmalloc.P
+.deps/malloc.P .deps/memcpy.P .deps/memset.P .deps/obstack.P \
+.deps/realloc.P .deps/regex.P .deps/strcspn.P .deps/strdup.P \
+.deps/strndup.P .deps/strpbrk.P .deps/strspn.P .deps/strstr.P \
+.deps/strtok.P .deps/xgetcwd.P .deps/xmalloc.P
 SOURCES = $(libsys_a_SOURCES)
 OBJECTS = $(libsys_a_OBJECTS)
 
@@ -212,6 +214,8 @@ getopt_.c: getopt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
+malloc_.c: malloc.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/malloc.c; then echo $(srcdir)/malloc.c; else echo malloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > malloc_.c
 memcpy_.c: memcpy.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c
 memset_.c: memset.c $(ANSI2KNR)
@@ -239,9 +243,9 @@ xgetcwd_.c: xgetcwd.c $(ANSI2KNR)
 xmalloc_.c: xmalloc.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
 alloca_.o basename_.o dirname_.o error_.o fnmatch_.o getopt_.o \
-getopt1_.o memcpy_.o memset_.o obstack_.o regex_.o strcspn_.o strdup_.o \
-strndup_.o strpbrk_.o strspn_.o strstr_.o strtok_.o xgetcwd_.o \
-xmalloc_.o : $(ANSI2KNR)
+getopt1_.o malloc_.o memcpy_.o memset_.o obstack_.o regex_.o strcspn_.o \
+strdup_.o strndup_.o strpbrk_.o strspn_.o strstr_.o strtok_.o \
+xgetcwd_.o xmalloc_.o : $(ANSI2KNR)
 
 tags: TAGS
 
diff --git a/libidu/Makefile.in b/libidu/Makefile.in
index fd8e785..8c1331a 100644
--- a/libidu/Makefile.in
+++ b/libidu/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 32b9e5c..0067046 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 4e754f0..d85d248 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -93,7 +94,7 @@ l = @l@
 lispdir = @lispdir@
 
 
-EXTRA_DIST = README Makefile.am.in gettext.m4 lcmessage.m4 progtest.m4
+EXTRA_DIST = README Makefile.am.in gettext.m4 lcmessage.m4 malloc.m4 progtest.m4 realloc.m4
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/po/de.po b/po/de.po
index 59ee2f1..c98e3ef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
-"POT-Creation-Date: 1999-04-08 03:00-0700\n"
+"POT-Creation-Date: 1999-04-09 01:47-0700\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"
@@ -197,54 +197,65 @@ msgstr ""
 msgid "can't stat `%s' from `%s'"
 msgstr ""
 
-#: lib/getopt.c:527
+#: lib/getopt.c:677
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:550
+#: lib/getopt.c:702
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:555
+#: lib/getopt.c:707
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:570
+#: lib/getopt.c:725 lib/getopt.c:898
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
 #. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
 #. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:758
 #, 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:784
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:630
+#: lib/getopt.c:787
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:666
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:817 lib/getopt.c:947
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
+#: lib/getopt.c:864
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:882
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
 #: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
 #, c-format
 msgid "Try `%s --help' for more information.\n"
diff --git a/po/fr.po b/po/fr.po
index 670c2a5..7fff4c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-04-08 03:00-0700\n"
+"POT-Creation-Date: 1999-04-09 01:47-0700\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"
@@ -208,54 +208,65 @@ msgstr ""
 msgid "can't stat `%s' from `%s'"
 msgstr ""
 
-#: lib/getopt.c:527
+#: lib/getopt.c:677
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:550
+#: lib/getopt.c:702
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:555
+#: lib/getopt.c:707
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:570
+#: lib/getopt.c:725 lib/getopt.c:898
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
 #. --option
-#: lib/getopt.c:598
+#: lib/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
 #. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:758
 #, 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:784
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:630
+#: lib/getopt.c:787
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:666
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:817 lib/getopt.c:947
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
+#: lib/getopt.c:864
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:882
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
 #: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
 #, c-format
 msgid "Try `%s --help' for more information.\n"
diff --git a/po/nl.po b/po/nl.po
index bf91e1c..9b66418 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.2\n"
-"POT-Creation-Date: 1996-08-06 23:24-0400\n"
+"POT-Creation-Date: 1999-04-09 01:47-0700\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,29 +13,29 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libidu/hash.c:52
+#: 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:247
+#: libidu/hash.c:264
 msgid "Load=%ld/%ld=%.0f%%, "
 msgstr "Belasting=%ld/%ld=%.0f%%, "
 
-#: libidu/hash.c:249
+#: libidu/hash.c:266
 #, c-format
 msgid "Rehash=%d, "
 msgstr "herverfrommeling=%d, "
 
-#: libidu/hash.c:250
+#: libidu/hash.c:267
 msgid "Collisions=%ld/%ld=%.0f%%"
 msgstr "Botsingen=%ld/%ld=%.0f%%"
 
-#: libidu/idfile.c:106
+#: libidu/idfile.c:105
 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:386 src/xtokid.c:214
+#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
 #, c-format
 msgid "can't open `%s'"
 msgstr "kan `%s' niet openen"
@@ -65,50 +65,53 @@ msgstr "onbekend I/O type: %d"
 msgid "unsupported size in io_write (): %d"
 msgstr "niet-ondersteunde afmeting in io_write(): %d"
 
-#: libidu/scanners.c:93
+#: libidu/scanners.c:95
 #, c-format
 msgid "unrecognized language: `%s'"
 msgstr "niet herkende taal: `%s'"
 
-#: libidu/scanners.c:139
+#: libidu/scanners.c:141
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr "kan geen objectstapel voor taalargumenten vrijmaken: geheugen vol"
 
-#: libidu/scanners.c:193 libidu/scanners.c:262
+#: libidu/scanners.c:195 libidu/scanners.c:264
 msgid "can't allocate language args: memory exhausted"
 msgstr "kan geen geheugen vrijmaken voor taalargumenten: geheugen vol"
 
-#: libidu/scanners.c:201
+#: libidu/scanners.c:203
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr "taalnaam verwacht na `%s' in bestand `%s'"
 
-#: libidu/scanners.c:256
+#: libidu/scanners.c:258
 #, c-format
 msgid "can't open language map file `%s'"
 msgstr "kan taalbestand `%s' niet openen"
 
-#: libidu/scanners.c:258
+#: libidu/scanners.c:260
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr "kan grootte van mapbestand `%s' niet krijgen"
 
-#: libidu/scanners.c:268
+#: libidu/scanners.c:270
 #, c-format
 msgid "can't read language map file `%s'"
 msgstr "kan taalbestand `%s' niet lezen"
 
-#: libidu/scanners.c:271
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr "kan niet het hele taalbestand `%s' lezen"
 
-#: libidu/scanners.c:412
+#: libidu/scanners.c:418
 msgid ""
 "C language:\n"
-"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the result\n"
-"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the result\n"
-"  -u,--strip-underscore  Strip a leading underscore from single-token strings\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
 msgstr ""
 "C taal:\n"
 "  -k,--keep=TEKENS      Sta TEKENS toe in reeksen van een eenheid, behoud\n"
@@ -118,17 +121,17 @@ msgstr ""
 "  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
 "                        weg van reeksen van een eenheid\n"
 
-#: libidu/scanners.c:681 libidu/scanners.c:986 libidu/scanners.c:1190
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
 #, c-format
 msgid "junk: `%c'"
 msgstr "onzin: `%c'"
 
-#: libidu/scanners.c:683 libidu/scanners.c:988 libidu/scanners.c:1192
+#: libidu/scanners.c:703 libidu/scanners.c:974 libidu/scanners.c:1177
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "onzin: `\\%03o'"
 
-#: libidu/scanners.c:787
+#: libidu/scanners.c:807
 msgid ""
 "Assembly language:\n"
 "  -c,--comment=CHARS     Any of CHARS starts a comment until end-of-line\n"
@@ -138,123 +141,142 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 "Assembeertaal:\n"
-"  -c,--comment=TEKENS    Een van TEKENS begint een commentaar tot einde van de regel\n"
+"  -c,--comment=TEKENS    Een van TEKENS begint een commentaar tot einde van "
+"de regel\n"
 "  -k,--keep=TEKENS       Sta TEKENS in eenheden toe, behoud resultaat\n"
 "  -i,--ignore=TEKENS     Sta TEKENS in eenheden toe, gooi resultaat weg\n"
-"  -u,--strip-underscore  Verwijder een voorgaande underscore `_' uit eenheden\n"
+"  -u,--strip-underscore  Verwijder een voorgaande underscore `_' uit "
+"eenheden\n"
 "  -n,--no-cpp            Behandel geen C pre-processor aanwijzingen\n"
 
-#: libidu/scanners.c:1092
+#: libidu/scanners.c:1078
 msgid ""
 "Text language:\n"
-"  -i,--include=CHAR-CLASS  Treat characters of CHAR-CLASS as token constituents\n"
-"  -x,--exclude=CHAR-CLASS  Treat characters of CHAR-CLASS as token delimiters\n"
+"  -i,--include=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
+"constituents\n"
+"  -x,--exclude=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
+"delimiters\n"
 msgstr ""
 "Tekst taal:\n"
-"  -i,--include=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als onderdeel van een eenheid\n"
-"  -x,--exclude=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als eenheidscheiding\n"
+"  -i,--include=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als onderdeel "
+"van een eenheid\n"
+"  -x,--exclude=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als "
+"eenheidscheiding\n"
 
-#: libidu/walker.c:103
+#: libidu/walker.c:107
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
 msgstr "kan map `%s' niet lezen (`.' van `%s')"
 
-#: libidu/walker.c:170
+#: libidu/walker.c:174
 #, 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:171 libidu/walker.c:172
+#: libidu/walker.c:175 libidu/walker.c:176
 msgid "file"
 msgstr "bestand"
 
-#: libidu/walker.c:171 libidu/walker.c:172
+#: libidu/walker.c:175 libidu/walker.c:176
 msgid "directory"
 msgstr "map"
 
-#: libidu/walker.c:291
+#: libidu/walker.c:299
 #, 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!"
+msgstr ""
+"waarschuwing: `%s' en `%s' zijn het zelfde bestand, maar leveren "
+"verschillende resultaten op!"
 
-#: libidu/walker.c:385
+#: libidu/walker.c:393
 #, c-format
 msgid "notice: scan parameters changed for `%s'"
 msgstr "opmerking: leesparameters veranderd voor `%s'"
 
-#: libidu/walker.c:580
+#: libidu/walker.c:597
 msgid "can't get working directory"
 msgstr "kan huidige map niet verkrijgen"
 
-#: libidu/walker.c:637
+#: libidu/walker.c:654
 #, c-format
 msgid "can't chdir to `%s'"
 msgstr "kan niet naar map `%s' gaan"
 
-#: libidu/walker.c:642
+#: libidu/walker.c:659
 #, c-format
 msgid "can't chdir to `%s' from `%s'"
 msgstr "kan niet van map `%s' naar `%s' gaan"
 
-#: libidu/walker.c:696
+#: libidu/walker.c:713
 #, c-format
 msgid "can't lstat `%s' from `%s'"
 msgstr "kan de status van de link `%s' niet opvragen vanuit `%s'"
 
-#: libidu/walker.c:704
+#: libidu/walker.c:721
 #, 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:677
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is dubbelzinnig\n"
 
-#: lib/getopt.c:550
+#: lib/getopt.c:702
 #, 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:707
 #, 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:725 lib/getopt.c:898
 #, 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:754
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
 #. +option or -option
-#: lib/getopt.c:602
+#: lib/getopt.c:758
 #, 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:784
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: lib/getopt.c:630
+#: lib/getopt.c:787
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: lib/getopt.c:666
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:817 lib/getopt.c:947
 #, 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:237 src/mkid.c:120 src/xtokid.c:43
+#: lib/getopt.c:864
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: optie `%s' is dubbelzinnig\n"
+
+#: lib/getopt.c:882
+#, 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:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
@@ -289,7 +311,7 @@ msgstr "geen bestandsnaam argumenten"
 msgid "too many file name arguments"
 msgstr "te veel bestandsnaam argumenten"
 
-#: src/fid.c:153 src/fnid.c:147 src/lid.c:410
+#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
 msgid "can't locate `ID'"
 msgstr "kan `ID' niet vinden"
 
@@ -325,12 +347,12 @@ msgstr ""
 "      --help             geef deze hulp en beëindig\n"
 "      --version          geef versie informatie en beëindig\n"
 
-#: src/lid.c:245
+#: src/lid.c:241
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN...\n"
 msgstr "Aanroep: %s [OPTIE]... PATROON...\n"
 
-#: src/lid.c:249
+#: src/lid.c:245
 #, c-format
 msgid ""
 "Query ID database and report results.\n"
@@ -345,19 +367,25 @@ msgid ""
 "  -w, --word            match PATTERN as a delimited word\n"
 "  -s, --substring       match PATTERN as a substring\n"
 "            Note: If PATTERN contains extended regular expression meta-\n"
-"            characters, it is interpreted as a regular expression substring.\n"
+"            characters, it is interpreted as a regular expression "
+"substring.\n"
 "            Otherwise, PATTERN is interpreted as a literal word.\n"
 "\n"
 "  -k, --key=STYLE       STYLE is one of `token', `pattern' or `none'\n"
-"  -R, --result=STYLE    STYLE is one of `filenames', `grep', `edit' or `none'\n"
+"  -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"
-"            The above STYLE options control how query results are presented.\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"
 "\n"
 "  -F, --frequency=FREQ  find tokens that occur FREQ times, where FREQ\n"
-"                        is a range expressed as `N..M'.  If N is omitted, it\n"
-"                        defaults to 1, if M is omitted it defaults to MAX_USHRT\n"
+"                        is a range expressed as `N..M'.  If N is omitted, "
+"it\n"
+"                        defaults to 1, if M is omitted it defaults to "
+"MAX_USHRT\n"
 "  -a, --ambiguous=LEN   find tokens whose names are ambiguous for LEN chars\n"
 "\n"
 "  -x, --hex             only find numbers expressed as hexadecimal\n"
@@ -380,19 +408,25 @@ msgstr ""
 "  -w, --word            match PATTERN as a delimited word\n"
 "  -s, --substring       match PATTERN as a substring\n"
 "            Note: If PATTERN contains extended regular expression meta-\n"
-"            characters, it is interpreted as a regular expression substring.\n"
+"            characters, it is interpreted as a regular expression "
+"substring.\n"
 "            Otherwise, PATTERN is interpreted as a literal word.\n"
 "\n"
 "  -k, --key=STYLE       STYLE is one of `token', `pattern' or `none'\n"
-"  -R, --result=STYLE    STYLE is one of `filenames', `grep', `edit' or `none'\n"
+"  -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"
-"            The above STYLE options control how query results are presented.\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"
 "\n"
 "  -F, --frequency=FREQ  find tokens that occur FREQ times, where FREQ\n"
-"                        is a range expressed as `N..M'.  If N is omitted, it\n"
-"                        defaults to 1, if M is omitted it defaults to MAX_USHRT\n"
+"                        is a range expressed as `N..M'.  If N is omitted, "
+"it\n"
+"                        defaults to 1, if M is omitted it defaults to "
+"MAX_USHRT\n"
 "  -a, --ambiguous=LEN   find tokens whose names are ambiguous for LEN chars\n"
 "\n"
 "  -x, --hex             only find numbers expressed as hexadecimal\n"
@@ -403,65 +437,69 @@ msgstr ""
 "      --help            display this help and exit\n"
 "      --version         output version information and exit\n"
 
-#: src/lid.c:285
+#: src/lid.c:281
 msgid "braces"
 msgstr "accolades"
 
-#: src/lid.c:285
+#: src/lid.c:281
 msgid "space"
 msgstr "spatie"
 
-#: src/lid.c:351
+#: src/lid.c:347
 msgid "notice: use of `-e' is deprecated, use `-r' instead"
-msgstr "opmerking: gebruik van `-e' is verouderd, gebruik `-r' in plaats daarvan"
+msgstr ""
+"opmerking: gebruik van `-e' is verouderd, gebruik `-r' in plaats daarvan"
 
-#: src/lid.c:431
+#: src/lid.c:428
 #, 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"
+msgstr ""
+"Alle namen van variabelen zijn niet dubbelzinnig in de eerste %d tekens\n"
 
-#: src/lid.c:466
+#: src/lid.c:463
 #, c-format
 msgid "invalid `--key' style: `%s'"
 msgstr "ongeldige `--key' stijl: `%s'"
 
-#: src/lid.c:478
+#: src/lid.c:475
 #, c-format
 msgid "invalid `--result' style: `%s'"
 msgstr "ongeldige `--result' stijl: `%s'"
 
 #. FIXME: i18n of responses
-#: src/lid.c:634
+#: src/lid.c:632
 msgid "edit? [y1-9^S/nq] "
 msgstr "bewerken? [j1-9^S/nq]"
 
-#: src/lid.c:703
+#: src/lid.c:701
 msgid "can't fork"
 msgstr "kan geen nieuw proces beginnen"
 
-#: src/lid.c:721
+#: src/lid.c:719
 #, c-format
 msgid "can't exec `%s'"
 msgstr "kan `%s' niet uitvoeren"
 
-#: src/lid.c:851
+#: src/lid.c:853
 msgid "can't match regular-expression: memory exhausted"
 msgstr "kan reguliere expressie niet vergelijken: geheugen vol"
 
-#: src/mkid.c:145 src/xtokid.c:64
+#: src/mkid.c:147 src/xtokid.c:64
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr "Aanroep: %s [OPTIE]... [BESTAND]...\n"
 
-#: src/mkid.c:149
+#: src/mkid.c:151
 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 language\n"
+"  -m, --lang-map=MAPFILE  use MAPFILE to map file names onto source "
+"language\n"
 "  -d, --default-lang=LANG make LANG the default source language\n"
 "  -p, --prune=NAMES       exclude the named files and/or directories\n"
 "  -v, --verbose           report per file statistics\n"
@@ -479,10 +517,12 @@ 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 language\n"
+"  -m, --lang-map=MAPFILE  use MAPFILE to map file names onto source "
+"language\n"
 "  -d, --default-lang=LANG make LANG the default source language\n"
 "  -p, --prune=NAMES       exclude the named files and/or directories\n"
 "  -v, --verbose           report per file statistics\n"
@@ -497,106 +537,113 @@ msgstr ""
 "\n"
 "The following arguments apply to the language-specific scanners:\n"
 
-#: src/mkid.c:311
+#: src/mkid.c:357
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr "kan `%s' niet aanmaken in `%s'"
 
-#: src/mkid.c:315
+#: src/mkid.c:361
 #, c-format
 msgid "can't modify `%s'"
 msgstr "kan `%s' niet veranderen"
 
-#: src/mkid.c:368
+#: src/mkid.c:434
 #, c-format
 msgid "can't stat `%s'"
 msgstr "kan de status van `%s' niet opvragen"
 
-#: src/mkid.c:435
+#: src/mkid.c:503
 #, c-format
 msgid "  new = %d/%d"
 msgstr "  nieuw = %d/%d"
 
-#: src/mkid.c:444
+#: src/mkid.c:512
 #, c-format
 msgid "Name=%ld, "
 msgstr "Naam=%ld, "
 
-#: src/mkid.c:445
+#: src/mkid.c:513
 #, c-format
 msgid "Number=%ld, "
 msgstr "Nummer = %ld, "
 
-#: src/mkid.c:446
+#: src/mkid.c:514
 #, c-format
 msgid "String=%ld, "
 msgstr "Letterreeks=%ld, "
 
-#: src/mkid.c:447
+#: src/mkid.c:515
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Letterlijk=%ld, "
 
-#: src/mkid.c:448
+#: src/mkid.c:516
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaar=%ld\n"
 
-#: src/mkid.c:450
-#, c-format
-msgid "Files=%d, "
+#: src/mkid.c:518
+#, fuzzy, c-format
+msgid "Files=%ld, "
 msgstr "Bestanden=%d, "
 
-#: src/mkid.c:451
+#: src/mkid.c:519
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Eenheden=%ld, "
 
-#: src/mkid.c:452
+#: src/mkid.c:520
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:453
-#, c-format
-msgid "Heap=%ld+%ld Kb, "
+#: src/mkid.c:521
+#, fuzzy, c-format
+msgid "Heap=%d+%d Kb, "
 msgstr "Data=%ld+%ld Kb, "
 
-#: src/mkid.c:455
+#: src/mkid.c:523
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Uitvoer=%ld (%ld eenheden, %ld gevonden)\n"
 
-#: src/mkid.c:458
+#: src/mkid.c:526
 #, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr ", Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:481
+#: src/mkid.c:550
 msgid "Sorting tokens...\n"
 msgstr "Eenheden sorteren...\n"
 
-#: src/mkid.c:487
+#: src/mkid.c:556
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "`%s' schrijven...\n"
 
-#: src/mkid.c:490
+#: src/mkid.c:559
 #, c-format
 msgid "can't create `%s'"
 msgstr "kan `%s' niet aanmaken"
 
-#: src/mkid.c:636
+#: src/mkid.c:626
+#, c-format
+msgid "error closing `%s'"
+msgstr ""
+
+#: src/mkid.c:714
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld/%ld = %.0f%%\n"
 
 #: src/xtokid.c:68
 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 language\n"
+"  -m, --lang-map=MAPFILE  use MAPFILE to map file names onto source "
+"language\n"
 "  -d, --default-lang=LANG make LANG the default source language\n"
 "  -p, --prune=NAMES       exclude the named files and/or directories\n"
 "      --help              display this help and exit\n"
@@ -605,10 +652,12 @@ 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 language\n"
+"  -m, --lang-map=MAPFILE  use MAPFILE to map file names onto source "
+"language\n"
 "  -d, --default-lang=LANG make LANG the default source language\n"
 "  -p, --prune=NAMES       exclude the named files and/or directories\n"
 "      --help              display this help and exit\n"
diff --git a/po/pl.po b/po/pl.po
index 8595cd7..3393583 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.0.8\n"
+"POT-Creation-Date: 1999-04-09 01:47-0700\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"
@@ -12,444 +13,830 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: fid.c:47
-msgid "Usage: %s [-f<file>] file1 file2\n"
-msgstr "Użycie: %s [-f<plik>] plik1 plik2\n"
+#: libidu/hash.c:51
+#, c-format
+msgid "can't allocate %ld bytes for hash table: memory exhausted"
+msgstr ""
 
-#: fid.c:91 fid.c:97 filenames.c:590 lid.c:223 lid.c:251 lid.c:399 mkid.c:383
-msgid "open"
-msgstr "otwarty"
+#: libidu/hash.c:264
+#, fuzzy
+msgid "Load=%ld/%ld=%.0f%%, "
+msgstr "Obciążenie=%ld/%ld=%.2f, "
 
-#: fid.c:149 lid.c:324
-msgid "%s: not found\n"
-msgstr "%s: nie odnaleziony\n"
+#: libidu/hash.c:266
+#, c-format
+msgid "Rehash=%d, "
+msgstr "Ponownie mieszanie=%d, "
 
-#: idfile.c:55
-msgid "%s: Not an id file: `%s'\n"
-msgstr "%s: nie jest plikiem identyfikatorów: `%s'\n"
+#: libidu/hash.c:267
+#, fuzzy
+msgid "Collisions=%ld/%ld=%.0f%%"
+msgstr "Próby=%ld/%ld=%.2f, "
 
-#: idfile.c:60
-msgid "%s: ID version mismatch (want: %d, got: %d)\n"
-msgstr "%s: Niezgodność identyfikatorów wersji (chcę: %d, dostałem: %d)\n"
+#: libidu/idfile.c:105
+msgid "can't determine the io_size of a string!"
+msgstr ""
+
+#: libidu/idread.c:45 src/mkid.c:451 src/xtokid.c:221
+#, c-format
+msgid "can't open `%s'"
+msgstr ""
+
+#: libidu/idread.c:64
+#, c-format
+msgid "`%s' is not an ID file! (bad magic #)"
+msgstr ""
 
-#: idfile.c:132 idfile.c:164
-msgid "Unsupported size in io_write (): %d\n"
+#: libidu/idread.c:66
+#, c-format
+msgid "`%s' is version %d, but I only grok version %d"
+msgstr ""
+
+#: libidu/idread.c:186
+#, 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
+#, c-format
+msgid "unknown I/O type: %d"
+msgstr ""
+
+#: libidu/idwrite.c:156
+#, fuzzy, c-format
+msgid "unsupported size in io_write (): %d"
 msgstr "Nie obsługiwany rozmiar w io_write (): %d\n"
 
-#: idx.c:19
-msgid "Usage: %s [-u] [+/-a<ccc>] [-c<ccc>] files\n"
-msgstr "Użycie: %s [-u] [+/-a<ccc>] [-c<ccc>] pliki\n"
+#: libidu/scanners.c:95
+#, fuzzy, c-format
+msgid "unrecognized language: `%s'"
+msgstr "Brak skanera dla języka `%s'\n"
+
+#: libidu/scanners.c:141
+msgid "can't allocate language args obstack: memory exhausted"
+msgstr ""
+
+#: libidu/scanners.c:195 libidu/scanners.c:264
+msgid "can't allocate language args: memory exhausted"
+msgstr ""
+
+#: libidu/scanners.c:203
+#, c-format
+msgid "language name expected following `%s' in file `%s'"
+msgstr ""
 
-#: iid.y:498
-msgid "Syntax error near end of command.\n"
-msgstr "Błąd składni w pobliżu końca polecenia.\n"
+#: libidu/scanners.c:258
+#, fuzzy, c-format
+msgid "can't open language map file `%s'"
+msgstr "Brak skanera dla języka `%s'\n"
 
-#: iid.y:500
-msgid "Syntax error on or before %s\n"
-msgstr "Błąd składni w lub przed %s\n"
+#: libidu/scanners.c:260
+#, c-format
+msgid "can't get size of map file `%s'"
+msgstr ""
 
-#: iid.y:614
-msgid "Out of memory in yylex"
-msgstr "Za mało pamięci w yylex"
+#: libidu/scanners.c:270
+#, fuzzy, c-format
+msgid "can't read language map file `%s'"
+msgstr "Brak skanera dla języka `%s'\n"
 
-#: iid.y:648
+#: libidu/scanners.c:273
+#, c-format
+msgid "can't read entire language map file `%s'"
+msgstr ""
+
+#: libidu/scanners.c:418
 msgid ""
-"iid: interactive ID database query tool. Call with:\n"
-"   iid [-a] [-c] [-H]\n"
-"\n"
-"-a\tUse the aid as the default query command (not lid).\n"
-"-c cmd\tExecute the single query cmd and exit.\n"
-"-H\tPrint this message and exit.\n"
-"\n"
-"To get help after starting program type 'help'.\n"
+"C language:\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
 msgstr ""
-"iid: interaktywne narzędzie odpytywania bazy danych identyfikatorów\n"
-"Wywołanie: iid [-a] [-c] [-H]\n"
-"\n"
-"-a\tUżyj aid jako domyślnej komendy zapytania (a nie lid).\n"
-"-c pol\tWykonaj pojedyńcze zapytanie pol i zakończ pracę.\n"
-"-H\tWyświetl ten tekst pomocy i zakończ pracę.\n"
-"\n"
-"Aby uzyskać pomoc po uruchomieniu programu napisz 'help'.\n"
 
-#: iid.y:665
-msgid "iid: Excess arguments ignored.\n"
-msgstr "iid: Pominięto nadmiarowe argumenty.\n"
+#: libidu/scanners.c:701 libidu/scanners.c:972 libidu/scanners.c:1175
+#, c-format
+msgid "junk: `%c'"
+msgstr "śmieć: `%c'"
 
-#: iid.y:669
-msgid "run iid -H for help.\n"
-msgstr "napisz iid -H aby uzyskać tekst pomocy.\n"
+#: libidu/scanners.c:703 libidu/scanners.c:974 libidu/scanners.c:1177
+#, c-format
+msgid "junk: `\\%03o'"
+msgstr "śmieć: `\\%03o'"
 
-#: iid.y:757
-msgid "Fatal error: %s\n"
-msgstr "Poważny błąd: %s\n"
+#: libidu/scanners.c:807
+msgid ""
+"Assembly language:\n"
+"  -c,--comment=CHARS     Any of CHARS starts a comment until end-of-line\n"
+"  -k,--keep=CHARS        Allow CHARS in tokens, and keep the result\n"
+"  -i,--ignore=CHARS      Allow CHARS in tokens, and toss the result\n"
+"  -u,--strip-underscore  Strip a leading underscore from tokens\n"
+"  -n,--no-cpp            Don't handle C pre-processor directives\n"
+msgstr ""
 
-#: iid.y:820
-msgid "No sets defined yet.\n"
-msgstr "Nie zdefiniowano jeszcze zbiorów\n"
+#: libidu/scanners.c:1078
+msgid ""
+"Text language:\n"
+"  -i,--include=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
+"constituents\n"
+"  -x,--exclude=CHAR-CLASS  Treat characters of CHAR-CLASS as token "
+"delimiters\n"
+msgstr ""
 
-#: iid.y:839
-msgid "Out of memory in SetList"
-msgstr "Za mało pamięci w SetList"
+#: libidu/walker.c:107
+#, c-format
+msgid "can't read directory `%s' (`.' from `%s')"
+msgstr ""
 
-#: iid.y:891
-msgid "Out of memory in InitList"
-msgstr "Za mało pamięci w InitList"
+#: libidu/walker.c:174
+#, c-format
+msgid "notice: `%s' was a %s, but is now a %s!"
+msgstr ""
 
-#: iid.y:940
-msgid "No memory for set in InitIid"
-msgstr "Brak pamięci dla zbioru w InitIid"
+#: libidu/walker.c:175 libidu/walker.c:176
+msgid "file"
+msgstr ""
 
-#: iid.y:986
-msgid "No memory for symbol table entry in InstallFile"
-msgstr "Brak pamięci dla rekordu tablicy symboli w InstallFile"
+#: libidu/walker.c:175 libidu/walker.c:176
+msgid "directory"
+msgstr ""
 
-#: iid.y:1001
-msgid "No memory for TheFiles in InstallFile"
-msgstr "Brak pamięci dla TheFiles w InstallFile"
+#: libidu/walker.c:299
+#, c-format
+msgid "warning: `%s' and `%s' are the same file, but yield different scans!"
+msgstr ""
 
-#: iid.y:1024
-msgid "No memory for FileList in InstallFile"
-msgstr "Brak pamięci dla FileList w InstallFile"
+#: libidu/walker.c:393
+#, c-format
+msgid "notice: scan parameters changed for `%s'"
+msgstr ""
 
-#: iid.y:1076
-msgid "No memory for TheSets in AddSet"
-msgstr "Brak pamięci dla TheSets w AddSet"
+#: libidu/walker.c:597
+#, fuzzy
+msgid "can't get working directory"
+msgstr "%s: nie mogę pobrać nazwy bieżącego katalogu.\n"
 
-#: iid.y:1144
-msgid "No memory for set in RunProg"
-msgstr "Brak pamięci dla zbioru w RunProg"
+#: libidu/walker.c:654
+#, c-format
+msgid "can't chdir to `%s'"
+msgstr ""
 
-#: iid.y:1149
-msgid "No memory for set description in RunProg"
-msgstr "Brak pamięci dla opisu zbioru w RunProg"
+#: libidu/walker.c:659
+#, c-format
+msgid "can't chdir to `%s' from `%s'"
+msgstr ""
 
-#: iid.y:1168
-msgid "Directory %s not accessible.\n"
-msgstr "Katalog %s jest niedostępny.\n"
+#: libidu/walker.c:713
+#, c-format
+msgid "can't lstat `%s' from `%s'"
+msgstr ""
 
-#: iid.y:1194
-msgid "No memory for set in SetIntersect"
-msgstr "Brak pamięci dla zbioru w SetIntersect"
+#: libidu/walker.c:721
+#, c-format
+msgid "can't stat `%s' from `%s'"
+msgstr ""
 
-#: iid.y:1200
-msgid "No memory for set description in SetIntersect"
-msgstr "Brak pamięci dla opisu zbioru w SetIntersect"
+#: lib/getopt.c:677
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
 
-#: iid.y:1240
-msgid "No memory for set in SetUnion"
-msgstr "Brak pamięci dla zbioru w SetUnion"
+#: lib/getopt.c:702
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
 
-#: iid.y:1246
-msgid "No memory for set description in SetUnion"
-msgstr "Brak pamięci dla opisu zbioru w SetUnion"
+#: lib/getopt.c:707
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
 
-#: iid.y:1293
-msgid "No memory for set in SetInverse"
-msgstr "Brak pamięci dla zbioru w SetInverse"
+#: lib/getopt.c:725 lib/getopt.c:898
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#. --option
+#: lib/getopt.c:754
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
 
-#: iid.y:1297
-msgid "No memory for set description in SetInverse"
-msgstr "Brak pamięci dla opisu zbioru w SetInverse"
+#. +option or -option
+#: lib/getopt.c:758
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
 
-#: lid.c:120
-msgid "Usage: %s [-f<file>] [-u<n>] [-r<dir>] [-mewdoxasknc] pattern...\n"
-msgstr "Użycie: %s [-f<plik>] [-u<n>] [-r<katalog>] [-mewdoxasknc] wzór...\n"
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:784
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
 
-#: lid.c:216
-msgid "%s: please use only one of -c or -r\n"
-msgstr "%s: proszę użyj albo opcji -c albo -r\n"
+#: lib/getopt.c:787
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
 
-#: lid.c:229
-msgid "%s: cannot determine current directory\n"
-msgstr "%s: nie mogę określić bieżącego katalogu\n"
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:817 lib/getopt.c:947
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
 
-#: lid.c:319
-msgid "All identifiers are unique within the first %d characters\n"
+#: lib/getopt.c:864
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:882
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/fid.c:70 src/fnid.c:49 src/lid.c:233 src/mkid.c:122 src/xtokid.c:43
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ""
+
+#: src/fid.c:78
+#, c-format
+msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
+msgstr ""
+
+#: src/fid.c:81
+msgid ""
+"List identifiers that occur in FILENAME, or if FILENAME2 is\n"
+"also given list the identifiers that occur in both files.\n"
+"\n"
+"  -f, --file=FILE  file name of ID database\n"
+"      --help       display this help and exit\n"
+"      --version    output version information and exit\n"
+msgstr ""
+
+#: src/fid.c:141
+msgid "no file name arguments"
+msgstr ""
+
+#: src/fid.c:146
+msgid "too many file name arguments"
+msgstr ""
+
+#: src/fid.c:153 src/fnid.c:148 src/lid.c:407
+msgid "can't locate `ID'"
+msgstr ""
+
+#: src/fid.c:235
+#, c-format
+msgid "`%s' is ambiguous"
+msgstr ""
+
+#: src/fid.c:241
+#, fuzzy, c-format
+msgid "`%s' not found"
+msgstr "%s: nie odnaleziony\n"
+
+#: src/fnid.c:66
+#, c-format
+msgid "Usage: %s [OPTION]... [PATTERN]...\n"
+msgstr ""
+
+#: src/fnid.c:70
+msgid ""
+"Print constituent file names that match PATTERN,\n"
+"using shell-style wildcards.\n"
+"  -f, --file=FILE        file name of ID database\n"
+"  -S, --separator=STYLE  STYLE is one of `braces', `space' or `newline'\n"
+"      --help             display this help and exit\n"
+"      --version          output version information and exit\n"
+msgstr ""
+
+#: src/lid.c:241
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN...\n"
+msgstr ""
+
+#: src/lid.c:245
+#, c-format
+msgid ""
+"Query ID database and report results.\n"
+"By default, output consists of multiple lines, each line containing the\n"
+"matched identifier followed by the list of file names in which it occurs.\n"
+"\n"
+"  -f, --file=FILE       file name of ID database\n"
+"\n"
+"  -i, --ignore-case     match PATTERN case insensitively\n"
+"  -l, --literal         match PATTERN as a literal string\n"
+"  -r, --regexp          match PATTERN as a regular expression\n"
+"  -w, --word            match PATTERN as a delimited word\n"
+"  -s, --substring       match PATTERN as a substring\n"
+"            Note: If PATTERN contains extended regular expression meta-\n"
+"            characters, it is interpreted as a regular expression "
+"substring.\n"
+"            Otherwise, PATTERN is interpreted as a literal word.\n"
+"\n"
+"  -k, --key=STYLE       STYLE is one of `token', `pattern' or `none'\n"
+"  -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"
+"            The above STYLE options control how query results are "
+"presented.\n"
+"            Defaults are --key=token --result=filenames --separator=%s\n"
+"\n"
+"  -F, --frequency=FREQ  find tokens that occur FREQ times, where FREQ\n"
+"                        is a range expressed as `N..M'.  If N is omitted, "
+"it\n"
+"                        defaults to 1, if M is omitted it defaults to "
+"MAX_USHRT\n"
+"  -a, --ambiguous=LEN   find tokens whose names are ambiguous for LEN chars\n"
+"\n"
+"  -x, --hex             only find numbers expressed as hexadecimal\n"
+"  -d, --decimal         only find numbers expressed as decimal\n"
+"  -o, --octal           only find numbers expressed as octal\n"
+"            By default, searches match numbers of any radix.\n"
+"\n"
+"      --help            display this help and exit\n"
+"      --version         output version information and exit\n"
+msgstr ""
+
+#: src/lid.c:281
+msgid "braces"
+msgstr ""
+
+#: src/lid.c:281
+msgid "space"
+msgstr ""
+
+#: src/lid.c:347
+msgid "notice: use of `-e' is deprecated, use `-r' instead"
+msgstr ""
+
+#: src/lid.c:428
+#, 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"
 
-#: lid.c:385 lid.c:624 lid.c:1037
-msgid "%s: Syntax Error: %s (%s)\n"
-msgstr "%s: Błąd składni: %s (%s)\n"
+#: src/lid.c:463
+#, c-format
+msgid "invalid `--key' style: `%s'"
+msgstr ""
+
+#: src/lid.c:475
+#, c-format
+msgid "invalid `--result' style: `%s'"
+msgstr ""
 
-#: lid.c:458
-msgid "Edit? [y1-9^S/nq] "
+#. FIXME: i18n of responses
+#: src/lid.c:632
+#, fuzzy
+msgid "edit? [y1-9^S/nq] "
 msgstr "Edytować? [y1-9^S/nq] "
 
-#: lid.c:527
-msgid "%s: Cannot fork (%s)\n"
-msgstr "%s: Nie mogę wywołać (%s)\n"
+#: src/lid.c:701
+msgid "can't fork"
+msgstr ""
 
-#: lid.c:539
-msgid "exec"
-msgstr "uruchomienie"
+#: src/lid.c:719
+#, c-format
+msgid "can't exec `%s'"
+msgstr ""
 
-#: lid.c:800
-msgid "Bogus frequencies: %u > %u\n"
-msgstr "Bezsensowne częstości: %u > %u\n"
+#: src/lid.c:853
+msgid "can't match regular-expression: memory exhausted"
+msgstr ""
 
-#: misc.c:78
-msgid "%s: Cannot %s `%s' (%s)\n"
-msgstr "%s: Nie mogę %s `%s' (%s)\n"
+#: src/mkid.c:147 src/xtokid.c:64
+#, c-format
+msgid "Usage: %s [OPTION]... [FILE]...\n"
+msgstr ""
 
-#: mkid.c:151
+#: src/mkid.c:151
 msgid ""
-"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"
-"\t-l<lang> Force files to be scanned as <lang> until +l<lang>\n"
-"\t-S<lang>-<arg> Pass arg to <lang> scanner\n"
-"\t-S.<suffix>=<lang> Scan files with .<suffix> as <lang>\n"
-"\t-S<lang>? Print usage documentation for <lang>\n"
-"\t-u\t Update an existing database (unimplemented)\n"
+"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"
+"  -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 "
+"language\n"
+"  -d, --default-lang=LANG make LANG the default source language\n"
+"  -p, --prune=NAMES       exclude the named files and/or directories\n"
+"  -v, --verbose           report per file statistics\n"
+"  -s, --statistics        report statistics at end of run\n"
 "\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"
-"\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"
-"\t-l<język> Wymuś odczytywanie linii w <języku> dopóki nie napotka +l<język>\n"
-"\t-S<język>-<arg> Prześlij argument do skanera <języka>\n"
-"\t-S.<rozsz>=<język> Przeglądaj pliki z .<rozsz> jako <język>\n"
-"\t-S<język>? Wyświetl dokumentacje użycia <języka>\n"
-"\t-u\t Uaktualnij istniejącą bazę danych (nie zaimplementowane)\n"
+"      --help              display this help and exit\n"
+"      --version           output version information and exit\n"
 "\n"
-"Wersja %s; Wykonano %s %s\n"
-
-#: mkid.c:177
-msgid "%s: cannot get current working directory name.\n"
-msgstr "%s: nie mogę pobrać nazwy bieżącego katalogu.\n"
+"FILE may be a file name, or a directory name to recursively search.\n"
+"If no FILE is given, the current directory is searched by default.\n"
+"Note that the `--include' and `--exclude' options are mutually-exclusive.\n"
+"\n"
+"The following arguments apply to the language-specific scanners:\n"
+msgstr ""
 
-#: mkid.c:187
-msgid "Nothing to do...\n"
-msgstr "Nic do zrobienia...\n"
+#: src/mkid.c:357
+#, c-format
+msgid "can't create `%s' in `%s'"
+msgstr ""
 
-#: mkid.c:198
-msgid "modify"
-msgstr "zmodyfikuj"
+#: src/mkid.c:361
+#, c-format
+msgid "can't modify `%s'"
+msgstr ""
 
-#: mkid.c:272
-msgid "%s: No language assigned to suffix: `%s'\n"
-msgstr "%s: Nie przypisano żadnego języka do rozszerzenia: `%s'\n"
+#: src/mkid.c:434
+#, c-format
+msgid "can't stat `%s'"
+msgstr ""
 
-#: mkid.c:279
-msgid "%s: No scanner for language: `%s'\n"
-msgstr "%s: Brak skanera dla języka: `%s'\n"
+#: src/mkid.c:503
+#, fuzzy, c-format
+msgid "  new = %d/%d"
+msgstr ", nowy=%d/%d"
 
-#: mkid.c:311
+#: src/mkid.c:512
+#, c-format
 msgid "Name=%ld, "
 msgstr "Nazwa=%ld, "
 
-#: mkid.c:312
+#: src/mkid.c:513
+#, c-format
 msgid "Number=%ld, "
 msgstr "Numer=%ld, "
 
-#: mkid.c:313
+#: src/mkid.c:514
+#, c-format
 msgid "String=%ld, "
 msgstr "Łańcuch=%ld, "
 
-#: mkid.c:314
+#: src/mkid.c:515
+#, c-format
 msgid "Literal=%ld, "
 msgstr "Literał=%ld, "
 
-#: mkid.c:315
+#: src/mkid.c:516
+#, c-format
 msgid "Comment=%ld\n"
 msgstr "Komentarz=%ld\n"
 
-#: mkid.c:317
-msgid "Files=%d, "
+#: src/mkid.c:518
+#, fuzzy, c-format
+msgid "Files=%ld, "
 msgstr "Pliki=%d, "
 
-#: mkid.c:318
+#: src/mkid.c:519
+#, c-format
 msgid "Tokens=%ld, "
 msgstr "Znaczniki=%ld, "
 
-#: mkid.c:319
+#: src/mkid.c:520
+#, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bajty=%ld Kb, "
 
-#: mkid.c:320
-msgid "Heap=%ld Kb, "
+#: src/mkid.c:521
+#, fuzzy, c-format
+msgid "Heap=%d+%d Kb, "
 msgstr "Sterta=%ld Kb, "
 
-#: mkid.c:321
+#: src/mkid.c:523
+#, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Wynik=%ld (%ld tok, %ld hit)\n"
 
-#: mkid.c:323
-msgid "Load=%ld/%ld=%.2f, "
-msgstr "Obciążenie=%ld/%ld=%.2f, "
-
-#: mkid.c:325
-msgid "Rehash=%d, "
-msgstr "Ponownie mieszanie=%d, "
-
-#: mkid.c:326
-msgid "Probes=%ld/%ld=%.2f, "
-msgstr "Próby=%ld/%ld=%.2f, "
-
-#: mkid.c:328
-msgid "Freq=%ld/%ld=%.2f\n"
+#: src/mkid.c:526
+#, fuzzy, c-format
+msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Częstość=%ld/%ld=%.2f\n"
 
-#: mkid.c:431
-msgid "%s: Use -u, -f<file>, or cmd-line for file args!\n"
-msgstr "%s: Użyj -u, -f<plik>, lub linii poleceń dla argumentów pliku!\n"
-
-#: mkid.c:434
-msgid "%s: Use only one of: -u, -f<file>, or cmd-line for file args!\n"
-msgstr "%s: Użyj albo -u, -f<plik>, lub linii poleceń dla argumentów pliku!\n"
-
-#: mkid.c:516
-msgid "  uniq=%d/%d"
-msgstr "  jednozn=%d/%d"
-
-#: mkid.c:519
-msgid ", new=%d/%d"
-msgstr ", nowy=%d/%d"
-
-#: mkid.c:548
+#: src/mkid.c:550
 msgid "Sorting tokens...\n"
 msgstr "Sortowanie znaczników...\n"
 
-#: mkid.c:554
+#: src/mkid.c:556
+#, c-format
 msgid "Writing `%s'...\n"
 msgstr "Zapisuję `%s'...\n"
 
-#: mkid.c:572
-msgid "create"
-msgstr "utwórz"
+#: src/mkid.c:559
+#, c-format
+msgid "can't create `%s'"
+msgstr ""
 
-#: mkid.c:731
+#: src/mkid.c:626
+#, c-format
+msgid "error closing `%s'"
+msgstr ""
+
+#: src/mkid.c:714
+#, fuzzy
+msgid "level %d: %ld/%ld = %.0f%%\n"
+msgstr "poziom %d: %ld == %ld\n"
+
+#: src/xtokid.c:68
 msgid ""
+"Print all tokens found in a source file.\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 "
+"language\n"
+"  -d, --default-lang=LANG make LANG the default source language\n"
+"  -p, --prune=NAMES       exclude the named files and/or directories\n"
+"      --help              display this help and exit\n"
+"      --version           output version information and exit\n"
 "\n"
-"\tRehashing... (doubling size to %ld)\n"
+"The following arguments apply to the language-specific scanners:\n"
 msgstr ""
-"\n"
-"\tPonowne mieszanie... (podwojenie rozmiaru do %ld)\n"
 
-#: mkid.c:744
-msgid "%s: Duplicate hash entry! \n"
-msgstr "%s Dwukrotne wystapienie hash rekordu \n"
+#~ msgid "Usage: %s [-f<file>] file1 file2\n"
+#~ msgstr "Użycie: %s [-f<plik>] plik1 plik2\n"
 
-#: mkid.c:774
-msgid "malloc failure! \n"
-msgstr "błąd przydziału pamięci! \n"
+#~ msgid "open"
+#~ msgstr "otwarty"
 
-#: mkid.c:854
-msgid "level %d: %ld < %ld/2\n"
-msgstr "poziom %d: %ld < %ld/2\n"
+#~ msgid "%s: Not an id file: `%s'\n"
+#~ msgstr "%s: nie jest plikiem identyfikatorów: `%s'\n"
 
-#: mkid.c:856
-msgid "level %d: %ld > %ld*2\n"
-msgstr "poziom %d: %ld > %ld*2\n"
+#~ msgid "%s: ID version mismatch (want: %d, got: %d)\n"
+#~ msgstr "%s: Niezgodność identyfikatorów wersji (chcę: %d, dostałem: %d)\n"
 
-#: mkid.c:858
-msgid "level %d: %ld < %ld\n"
-msgstr "poziom %d: %ld < %ld\n"
+#~ msgid "Usage: %s [-u] [+/-a<ccc>] [-c<ccc>] files\n"
+#~ msgstr "Użycie: %s [-u] [+/-a<ccc>] [-c<ccc>] pliki\n"
 
-#: mkid.c:860
-msgid "level %d: %ld > %ld\n"
-msgstr "poziom %d: %ld > %ld\n"
+#~ msgid "Syntax error near end of command.\n"
+#~ msgstr "Błąd składni w pobliżu końca polecenia.\n"
 
-#: mkid.c:862
-msgid "level %d: %ld == %ld\n"
-msgstr "poziom %d: %ld == %ld\n"
+#~ msgid "Syntax error on or before %s\n"
+#~ msgstr "Błąd składni w lub przed %s\n"
 
-#: scanners.c:250
-msgid "No scanner for language `%s'\n"
-msgstr "Brak skanera dla języka `%s'\n"
+#~ msgid "Out of memory in yylex"
+#~ msgstr "Za mało pamięci w yylex"
 
-#: scanners.c:271
-msgid "No scanner assigned to suffix `%s'\n"
-msgstr "Nie przypisano żadnego skanera do rozszerzenia: `%s'\n"
+#~ msgid ""
+#~ "iid: interactive ID database query tool. Call with:\n"
+#~ "   iid [-a] [-c] [-H]\n"
+#~ "\n"
+#~ "-a\tUse the aid as the default query command (not lid).\n"
+#~ "-c cmd\tExecute the single query cmd and exit.\n"
+#~ "-H\tPrint this message and exit.\n"
+#~ "\n"
+#~ "To get help after starting program type 'help'.\n"
+#~ msgstr ""
+#~ "iid: interaktywne narzędzie odpytywania bazy danych identyfikatorów\n"
+#~ "Wywołanie: iid [-a] [-c] [-H]\n"
+#~ "\n"
+#~ "-a\tUżyj aid jako domyślnej komendy zapytania (a nie lid).\n"
+#~ "-c pol\tWykonaj pojedyńcze zapytanie pol i zakończ pracę.\n"
+#~ "-H\tWyświetl ten tekst pomocy i zakończ pracę.\n"
+#~ "\n"
+#~ "Aby uzyskać pomoc po uruchomieniu programu napisz 'help'.\n"
 
-#: scanners.c:288 scanners.c:367
-msgid "%s: Language undefined: %s\n"
-msgstr "%s: Niezdefiniowany język: %s\n"
+#~ msgid "iid: Excess arguments ignored.\n"
+#~ msgstr "iid: Pominięto nadmiarowe argumenty.\n"
 
-#: scanners.c:302
-msgid "%s: Note: `%s=%s' overrides `%s=%s'\n"
-msgstr "%s: Uwaga: `%s=%s' zastępuje `%s=%s'\n"
+#~ msgid "run iid -H for help.\n"
+#~ msgstr "napisz iid -H aby uzyskać tekst pomocy.\n"
 
-#: scanners.c:331
-msgid "%s: language %s not defined.\n"
-msgstr "%s: język %s nie został zdefiniowany.\n"
+#~ msgid "Fatal error: %s\n"
+#~ msgstr "Poważny błąd: %s\n"
 
-#: scanners.c:338
-msgid "%s: Note: `%s/%s' overrides `%s/%s'\n"
-msgstr "%s: Note: `%s/%s' zastępuje `%s/%s'\n"
+#~ msgid "No sets defined yet.\n"
+#~ msgstr "Nie zdefiniowano jeszcze zbiorów\n"
+
+#~ msgid "Out of memory in SetList"
+#~ msgstr "Za mało pamięci w SetList"
 
-#: scanners.c:380
-msgid "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"
+#~ msgid "Out of memory in InitList"
+#~ msgstr "Za mało pamięci w InitList"
 
-#: scanners.c:683
-msgid "junk: `\\%3o'"
-msgstr "śmieć: `\\%3o'"
+#~ msgid "No memory for set in InitIid"
+#~ msgstr "Brak pamięci dla zbioru w InitIid"
 
-#: scanners.c:712
-msgid "Usage: %s does not accept %s scanner arguments\n"
-msgstr "Użycie: %s nie przyjmuje argumentów %s skanera\n"
+#~ msgid "No memory for symbol table entry in InstallFile"
+#~ msgstr "Brak pamięci dla rekordu tablicy symboli w InstallFile"
 
-#: scanners.c:716
-msgid ""
-"The C scanner arguments take the form -Sc<arg>, where <arg>\n"
-"is one of the following: (<cc> denotes one or more characters)\n"
-"  (+|-)u . . . . (Do|Don't) strip a leading `_' from ids in strings.\n"
-"  (+|-)s<cc> . . Allow <cc> in string ids, and (keep|ignore) those ids.\n"
-"  -v . . . . . . Skip vhil comments."
-msgstr ""
-"Argumenty skanera języka C przyjmują postać -Sc<arg>, gdzie <arg>\n"
-"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"
-"  -v . . . . . . Pomiń komentarze."
-
-#: scanners.c:952 scanners.c:1135
-msgid "junk: `\\%03o'"
-msgstr "śmieć: `\\%03o'"
+#~ msgid "No memory for TheFiles in InstallFile"
+#~ msgstr "Brak pamięci dla TheFiles w InstallFile"
 
-#: scanners.c:986
-msgid "Usage: %s -S%s([-c<cc>] [-u] [(+|-)a<cc>] [(+|-)p] [(+|-)C])\n"
-msgstr "Użycie: %s -S%s([-c<zn>] [-u] [(+|-)a<zn>] [(+|-)p] [(+|-)C])\n"
+#~ msgid "No memory for FileList in InstallFile"
+#~ msgstr "Brak pamięci dla FileList w InstallFile"
 
-#: scanners.c:990
-msgid ""
-"The Assembler scanner arguments take the form -Sasm<arg>, where\n"
-"<arg> is one of the following: (<cc> denotes one or more characters)\n"
-"  -c<cc> . . . . <cc> introduce(s) a comment until end-of-line.\n"
-"  (+|-)u . . . . (Do|Don't) strip a leading `_' from ids.\n"
-"  (+|-)a<cc> . . Allow <cc> in ids, and (keep|ignore) those ids.\n"
-"  (+|-)p . . . . (Do|Don't) handle C-preprocessor directives.\n"
-"  (+|-)C . . . . (Do|Don't) handle C-style comments. (/* */)"
-msgstr ""
-"Argumenty skanera asemblera przyjmują postać -Sasm<arg>, gdzie <arg>\n"
-"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"
-"  (+|-)p . . . . (Tak|Nie) rozpoznawaj dyrektywy preprocesora C.\n"
-"  (+|-)C . . . . (Tak|Nie) rozpoznawaj kometarze w stylu C (/* */)"
-
-#: scanners.c:1133
-msgid "junk: `%c'"
-msgstr "śmieć: `%c'"
+#~ msgid "No memory for TheSets in AddSet"
+#~ msgstr "Brak pamięci dla TheSets w AddSet"
 
-#: scanners.c:1166
-msgid "Usage: %s -S%s([(+|-)a<cc>] [(+|-)s<cc>]\n"
-msgstr "Użycie: %s -S%s([(+|-)a<zn>] [(+|-)s<zn>]\n"
+#~ msgid "No memory for set in RunProg"
+#~ msgstr "Brak pamięci dla zbioru w RunProg"
 
-#: scanners.c:1170
-msgid ""
-"The Text scanner arguments take the form -Stext<arg>, where\n"
-"<arg> is one of the following: (<cc> denotes one or more characters)\n"
-"  (+|-)a<cc> . . Include (or exculde) <cc> in ids.\n"
-"  (+|-)s<cc> . . Squeeze (or don't squeeze) <cc> out of ids."
-msgstr ""
-"Argumenty skanera tekstowego przyjmują postać -Stext<arg>, gdzie <arg>\n"
-"jest jednym z następujących: (<zn> oznacza jeden lub więcej znaków)\n"
-"  (+|-)a<zn> . . Dołącz (lub pomiń) <zn> w identyfikatorach .\n"
-"  (+|-)s<zn> . . Usuń (lub nie) <zn> z identyfikatorów."
+#~ msgid "No memory for set description in RunProg"
+#~ msgstr "Brak pamięci dla opisu zbioru w RunProg"
+
+#~ msgid "Directory %s not accessible.\n"
+#~ msgstr "Katalog %s jest niedostępny.\n"
+
+#~ msgid "No memory for set in SetIntersect"
+#~ msgstr "Brak pamięci dla zbioru w SetIntersect"
+
+#~ msgid "No memory for set description in SetIntersect"
+#~ msgstr "Brak pamięci dla opisu zbioru w SetIntersect"
+
+#~ msgid "No memory for set in SetUnion"
+#~ msgstr "Brak pamięci dla zbioru w SetUnion"
+
+#~ msgid "No memory for set description in SetUnion"
+#~ msgstr "Brak pamięci dla opisu zbioru w SetUnion"
+
+#~ msgid "No memory for set in SetInverse"
+#~ msgstr "Brak pamięci dla zbioru w SetInverse"
+
+#~ msgid "No memory for set description in SetInverse"
+#~ msgstr "Brak pamięci dla opisu zbioru w SetInverse"
+
+#~ msgid "Usage: %s [-f<file>] [-u<n>] [-r<dir>] [-mewdoxasknc] pattern...\n"
+#~ msgstr ""
+#~ "Użycie: %s [-f<plik>] [-u<n>] [-r<katalog>] [-mewdoxasknc] wzór...\n"
+
+#~ msgid "%s: please use only one of -c or -r\n"
+#~ msgstr "%s: proszę użyj albo opcji -c albo -r\n"
+
+#~ msgid "%s: cannot determine current directory\n"
+#~ msgstr "%s: nie mogę określić bieżącego katalogu\n"
+
+#~ msgid "%s: Syntax Error: %s (%s)\n"
+#~ msgstr "%s: Błąd składni: %s (%s)\n"
+
+#~ msgid "%s: Cannot fork (%s)\n"
+#~ msgstr "%s: Nie mogę wywołać (%s)\n"
+
+#~ msgid "exec"
+#~ msgstr "uruchomienie"
+
+#~ msgid "Bogus frequencies: %u > %u\n"
+#~ msgstr "Bezsensowne częstości: %u > %u\n"
+
+#~ msgid "%s: Cannot %s `%s' (%s)\n"
+#~ msgstr "%s: Nie mogę %s `%s' (%s)\n"
+
+#~ msgid ""
+#~ "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"
+#~ "\t-l<lang> Force files to be scanned as <lang> until +l<lang>\n"
+#~ "\t-S<lang>-<arg> Pass arg to <lang> scanner\n"
+#~ "\t-S.<suffix>=<lang> Scan files with .<suffix> as <lang>\n"
+#~ "\t-S<lang>? Print usage documentation for <lang>\n"
+#~ "\t-u\t Update an existing database (unimplemented)\n"
+#~ "\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"
+#~ "\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"
+#~ "\t-l<język> Wymuś odczytywanie linii w <języku> dopóki nie napotka "
+#~ "+l<język>\n"
+#~ "\t-S<język>-<arg> Prześlij argument do skanera <języka>\n"
+#~ "\t-S.<rozsz>=<język> Przeglądaj pliki z .<rozsz> jako <język>\n"
+#~ "\t-S<język>? Wyświetl dokumentacje użycia <języka>\n"
+#~ "\t-u\t Uaktualnij istniejącą bazę danych (nie zaimplementowane)\n"
+#~ "\n"
+#~ "Wersja %s; Wykonano %s %s\n"
+
+#~ msgid "Nothing to do...\n"
+#~ msgstr "Nic do zrobienia...\n"
+
+#~ msgid "modify"
+#~ msgstr "zmodyfikuj"
+
+#~ msgid "%s: No language assigned to suffix: `%s'\n"
+#~ msgstr "%s: Nie przypisano żadnego języka do rozszerzenia: `%s'\n"
+
+#~ msgid "%s: No scanner for language: `%s'\n"
+#~ msgstr "%s: Brak skanera dla języka: `%s'\n"
+
+#~ msgid "%s: Use -u, -f<file>, or cmd-line for file args!\n"
+#~ msgstr "%s: Użyj -u, -f<plik>, lub linii poleceń dla argumentów pliku!\n"
+
+#~ msgid "%s: Use only one of: -u, -f<file>, or cmd-line for file args!\n"
+#~ msgstr ""
+#~ "%s: Użyj albo -u, -f<plik>, lub linii poleceń dla argumentów pliku!\n"
+
+#~ msgid "  uniq=%d/%d"
+#~ msgstr "  jednozn=%d/%d"
+
+#~ msgid "create"
+#~ msgstr "utwórz"
+
+#~ msgid ""
+#~ "\n"
+#~ "\tRehashing... (doubling size to %ld)\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\tPonowne mieszanie... (podwojenie rozmiaru do %ld)\n"
+
+#~ msgid "%s: Duplicate hash entry! \n"
+#~ msgstr "%s Dwukrotne wystapienie hash rekordu \n"
+
+#~ msgid "malloc failure! \n"
+#~ msgstr "błąd przydziału pamięci! \n"
+
+#~ msgid "level %d: %ld < %ld/2\n"
+#~ msgstr "poziom %d: %ld < %ld/2\n"
+
+#~ msgid "level %d: %ld > %ld*2\n"
+#~ msgstr "poziom %d: %ld > %ld*2\n"
+
+#~ msgid "level %d: %ld < %ld\n"
+#~ msgstr "poziom %d: %ld < %ld\n"
+
+#~ msgid "level %d: %ld > %ld\n"
+#~ msgstr "poziom %d: %ld > %ld\n"
+
+#~ msgid "No scanner assigned to suffix `%s'\n"
+#~ msgstr "Nie przypisano żadnego skanera do rozszerzenia: `%s'\n"
+
+#~ msgid "%s: Language undefined: %s\n"
+#~ msgstr "%s: Niezdefiniowany język: %s\n"
+
+#~ msgid "%s: Note: `%s=%s' overrides `%s=%s'\n"
+#~ msgstr "%s: Uwaga: `%s=%s' zastępuje `%s=%s'\n"
+
+#~ msgid "%s: language %s not defined.\n"
+#~ msgstr "%s: język %s nie został zdefiniowany.\n"
+
+#~ msgid "%s: Note: `%s/%s' overrides `%s/%s'\n"
+#~ 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"
+#~ msgstr ""
+#~ "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'"
+
+#~ msgid "Usage: %s does not accept %s scanner arguments\n"
+#~ msgstr "Użycie: %s nie przyjmuje argumentów %s skanera\n"
+
+#~ msgid ""
+#~ "The C scanner arguments take the form -Sc<arg>, where <arg>\n"
+#~ "is one of the following: (<cc> denotes one or more characters)\n"
+#~ "  (+|-)u . . . . (Do|Don't) strip a leading `_' from ids in strings.\n"
+#~ "  (+|-)s<cc> . . Allow <cc> in string ids, and (keep|ignore) those ids.\n"
+#~ "  -v . . . . . . Skip vhil comments."
+#~ msgstr ""
+#~ "Argumenty skanera języka C przyjmują postać -Sc<arg>, gdzie <arg>\n"
+#~ "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"
+#~ "  -v . . . . . . Pomiń komentarze."
+
+#~ msgid "Usage: %s -S%s([-c<cc>] [-u] [(+|-)a<cc>] [(+|-)p] [(+|-)C])\n"
+#~ msgstr "Użycie: %s -S%s([-c<zn>] [-u] [(+|-)a<zn>] [(+|-)p] [(+|-)C])\n"
+
+#~ msgid ""
+#~ "The Assembler scanner arguments take the form -Sasm<arg>, where\n"
+#~ "<arg> is one of the following: (<cc> denotes one or more characters)\n"
+#~ "  -c<cc> . . . . <cc> introduce(s) a comment until end-of-line.\n"
+#~ "  (+|-)u . . . . (Do|Don't) strip a leading `_' from ids.\n"
+#~ "  (+|-)a<cc> . . Allow <cc> in ids, and (keep|ignore) those ids.\n"
+#~ "  (+|-)p . . . . (Do|Don't) handle C-preprocessor directives.\n"
+#~ "  (+|-)C . . . . (Do|Don't) handle C-style comments. (/* */)"
+#~ msgstr ""
+#~ "Argumenty skanera asemblera przyjmują postać -Sasm<arg>, gdzie <arg>\n"
+#~ "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"
+#~ "  (+|-)p . . . . (Tak|Nie) rozpoznawaj dyrektywy preprocesora C.\n"
+#~ "  (+|-)C . . . . (Tak|Nie) rozpoznawaj kometarze w stylu C (/* */)"
+
+#~ msgid "Usage: %s -S%s([(+|-)a<cc>] [(+|-)s<cc>]\n"
+#~ msgstr "Użycie: %s -S%s([(+|-)a<zn>] [(+|-)s<zn>]\n"
+
+#~ msgid ""
+#~ "The Text scanner arguments take the form -Stext<arg>, where\n"
+#~ "<arg> is one of the following: (<cc> denotes one or more characters)\n"
+#~ "  (+|-)a<cc> . . Include (or exculde) <cc> in ids.\n"
+#~ "  (+|-)s<cc> . . Squeeze (or don't squeeze) <cc> out of ids."
+#~ msgstr ""
+#~ "Argumenty skanera tekstowego przyjmują postać -Stext<arg>, gdzie <arg>\n"
+#~ "jest jednym z następujących: (<zn> oznacza jeden lub więcej znaków)\n"
+#~ "  (+|-)a<zn> . . Dołącz (lub pomiń) <zn> w identyfikatorach .\n"
+#~ "  (+|-)s<zn> . . Usuń (lub nie) <zn> z identyfikatorów."
diff --git a/src/Makefile.in b/src/Makefile.in
index b700115..b7e524c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index b04e801..e84733e 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -76,6 +76,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 LANGUAGE_MAP_FILE = @LANGUAGE_MAP_FILE@
 LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@