8 files changed, 212 insertions, 155 deletions
diff --git a/NEWS b/NEWS
index ff28886..181a892 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 idutils NEWS - User visible changes.
 
-Version 4.1 - ???, by Claudio Fontana
+Version 4.1 - March 12, 2006, by Claudio Fontana
 
+* new project name: idutils (change from id-utils)
 * fixed many portability issues
-* renamed all istances of id-utils with idutils
+* support for java and lisp
 
 Version 4.0 - Nov 1, 2005, by Claudio Fontana
 
diff --git a/configure b/configure
index 2111851..1c06732 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for idutils 4.1rc4.
+# Generated by GNU Autoconf 2.59 for idutils 4.1.
 #
 # Report bugs to <bug-idutils@gnu.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='idutils'
 PACKAGE_TARNAME='idutils'
-PACKAGE_VERSION='4.1rc4'
-PACKAGE_STRING='idutils 4.1rc4'
+PACKAGE_VERSION='4.1'
+PACKAGE_STRING='idutils 4.1'
 PACKAGE_BUGREPORT='bug-idutils@gnu.org'
 
 ac_unique_file="config.h.in"
@@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures idutils 4.1rc4 to adapt to many kinds of systems.
+\`configure' configures idutils 4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -856,7 +856,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of idutils 4.1rc4:";;
+     short | recursive ) echo "Configuration of idutils 4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -997,7 +997,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-idutils configure 4.1rc4
+idutils configure 4.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1011,7 +1011,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by idutils $as_me 4.1rc4, which was
+It was created by idutils $as_me 4.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1673,7 +1673,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='idutils'
- VERSION='4.1rc4'
+ VERSION='4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18854,7 +18854,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by idutils $as_me 4.1rc4, which was
+This file was extended by idutils $as_me 4.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18917,7 +18917,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-idutils config.status 4.1rc4
+idutils config.status 4.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 2f0b131..8efded7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([idutils], [4.1rc4], [bug-idutils@gnu.org])
+AC_INIT([idutils], [4.1], [bug-idutils@gnu.org])
 AC_GNU_SOURCE
 
 AM_INIT_AUTOMAKE
diff --git a/doc/version.texi b/doc/version.texi
index f81218b..f0f76af 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 15 February 2006
 @set UPDATED-MONTH February 2006
-@set EDITION 4.1rc4
-@set VERSION 4.1rc4
+@set EDITION 4.1
+@set VERSION 4.1
diff --git a/po/de.po b/po/de.po
index 738965a..9b31085 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-02-15 07:30+0100\n"
+"POT-Creation-Date: 2006-03-12 01:30+0100\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"
@@ -43,7 +43,7 @@ msgstr ""
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -325,24 +325,38 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:148
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"Report bugs to "
+msgstr ""
+
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/fid.c:149
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:153
+#: src/fid.c:154
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
+#: src/fid.c:161 src/fnid.c:156 src/lid.c:415
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:242
+#: src/fid.c:243
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:248
+#: src/fid.c:249
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s: nicht gefunden"
@@ -421,42 +435,42 @@ msgstr ""
 msgid "space"
 msgstr ""
 
-#: src/lid.c:354
+#: src/lid.c:355
 msgid "notice: use of `-e' is deprecated, use `-r' instead"
 msgstr ""
 
-#: src/lid.c:435
+#: src/lid.c:436
 #, 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:470
+#: src/lid.c:471
 #, c-format
 msgid "invalid `--key' style: `%s'"
 msgstr ""
 
-#: src/lid.c:482
+#: src/lid.c:483
 #, c-format
 msgid "invalid `--result' style: `%s'"
 msgstr ""
 
 # Muss hier auf `_j_ ... / nq' umgestellt werden????
-#: src/lid.c:639
+#: src/lid.c:640
 #, fuzzy, c-format
 msgid "edit? [y1-9^S/nq] "
 msgstr "Editieren? [y1-9^S/nq] "
 
-#: src/lid.c:708
+#: src/lid.c:709
 msgid "can't fork"
 msgstr ""
 
-#: src/lid.c:726
+#: src/lid.c:727
 #, c-format
 msgid "can't exec `%s'"
 msgstr ""
 
-#: src/lid.c:867
+#: src/lid.c:868
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
@@ -492,104 +506,104 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:376
+#: src/mkid.c:377
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:381
+#: src/mkid.c:382
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:458
+#: src/mkid.c:459
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:527
+#: src/mkid.c:528
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", new=%d/%d"
 
-#: src/mkid.c:536
+#: src/mkid.c:537
 #, c-format
 msgid "Name=%ld, "
 msgstr "Name=%ld, "
 
-#: src/mkid.c:537
+#: src/mkid.c:538
 #, c-format
 msgid "Number=%ld, "
 msgstr "Zahl=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:539
 #, c-format
 msgid "String=%ld, "
 msgstr "Zeichenkette=%ld, "
 
 # ist das gemeint? ###
-#: src/mkid.c:539
+#: src/mkid.c:540
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Zeichen=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:541
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Kommentar=%ld\n"
 
-#: src/mkid.c:542
+#: src/mkid.c:543
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Dateien=%d, "
 
-#: src/mkid.c:543
+#: src/mkid.c:544
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Tokens=%ld, "
 
-#: src/mkid.c:544
+#: src/mkid.c:545
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:545
+#: src/mkid.c:546
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "\"Heap\"=%ld Kb, "
 
-#: src/mkid.c:547
+#: src/mkid.c:548
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Ausgabe=%ld (%ld tok, %ld hit)\n"
 
 # Frequenz �bersetzen? ke
-#: src/mkid.c:550
+#: src/mkid.c:551
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "\"Freq\"=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:574
+#: src/mkid.c:575
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Sortiere \"Token\"...\n"
 
-#: src/mkid.c:580
+#: src/mkid.c:581
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Schreibe '%s'...\n"
 
-#: src/mkid.c:583
+#: src/mkid.c:584
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:651
+#: src/mkid.c:652
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:739
+#: src/mkid.c:740
 #, fuzzy, c-format
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "level %d: %ld == %ld\n"
diff --git a/po/fr.po b/po/fr.po
index a1a5780..fe9f373 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-02-15 07:30+0100\n"
+"POT-Creation-Date: 2006-03-12 01:30+0100\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"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -336,24 +336,38 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:148
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"Report bugs to "
+msgstr ""
+
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/fid.c:149
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:153
+#: src/fid.c:154
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
+#: src/fid.c:161 src/fnid.c:156 src/lid.c:415
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:242
+#: src/fid.c:243
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:248
+#: src/fid.c:249
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s pas trouv"
@@ -432,40 +446,40 @@ msgstr ""
 msgid "space"
 msgstr ""
 
-#: src/lid.c:354
+#: src/lid.c:355
 msgid "notice: use of `-e' is deprecated, use `-r' instead"
 msgstr ""
 
-#: src/lid.c:435
+#: src/lid.c:436
 #, 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 caractres\n"
 
-#: src/lid.c:470
+#: src/lid.c:471
 #, c-format
 msgid "invalid `--key' style: `%s'"
 msgstr ""
 
-#: src/lid.c:482
+#: src/lid.c:483
 #, c-format
 msgid "invalid `--result' style: `%s'"
 msgstr ""
 
-#: src/lid.c:639
+#: src/lid.c:640
 #, fuzzy, c-format
 msgid "edit? [y1-9^S/nq] "
 msgstr "diter? [y1-9^S/nq] "
 
-#: src/lid.c:708
+#: src/lid.c:709
 msgid "can't fork"
 msgstr ""
 
-#: src/lid.c:726
+#: src/lid.c:727
 #, c-format
 msgid "can't exec `%s'"
 msgstr ""
 
-#: src/lid.c:867
+#: src/lid.c:868
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
@@ -501,102 +515,102 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:376
+#: src/mkid.c:377
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:381
+#: src/mkid.c:382
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:458
+#: src/mkid.c:459
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:527
+#: src/mkid.c:528
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", nouveau=%d/%d"
 
-#: src/mkid.c:536
+#: src/mkid.c:537
 #, c-format
 msgid "Name=%ld, "
 msgstr "Nom=%ld, "
 
-#: src/mkid.c:537
+#: src/mkid.c:538
 #, c-format
 msgid "Number=%ld, "
 msgstr "Numro=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:539
 #, c-format
 msgid "String=%ld, "
 msgstr "Chane=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:540
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Litral=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:541
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaire=%ld\n"
 
-#: src/mkid.c:542
+#: src/mkid.c:543
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Fichiers=%d, "
 
-#: src/mkid.c:543
+#: src/mkid.c:544
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Units lexicales=%ld, "
 
-#: src/mkid.c:544
+#: src/mkid.c:545
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Octets=%ld Kb, "
 
-#: src/mkid.c:545
+#: src/mkid.c:546
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "tas=%ld Kb, "
 
-#: src/mkid.c:547
+#: src/mkid.c:548
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Sortie=%ld (%ld units lexicales, %ld Touches)\n"
 
-#: src/mkid.c:550
+#: src/mkid.c:551
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:574
+#: src/mkid.c:575
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Tri units lexicales...\n"
 
-#: src/mkid.c:580
+#: src/mkid.c:581
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "criture `%s'...\n"
 
-#: src/mkid.c:583
+#: src/mkid.c:584
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:651
+#: src/mkid.c:652
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:739
+#: src/mkid.c:740
 #, fuzzy, c-format
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld == %ld\n"
diff --git a/po/nl.po b/po/nl.po
index 10ac2c3..5ca8362 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.2\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-02-15 07:30+0100\n"
+"POT-Creation-Date: 2006-03-12 01:30+0100\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"
@@ -43,7 +43,7 @@ msgstr "Botsingen=%ld/%ld=%.0f%%"
 msgid "can't determine the io_size of a string!"
 msgstr "kan de io_size van een letterreeks niet vaststellen!"
 
-#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr "kan `%s' niet openen"
@@ -372,24 +372,38 @@ msgstr ""
 "      --help          geef deze hulp en be�indig\n"
 "      --version       geef versie informatie en be�indig\n"
 
-#: src/fid.c:148
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"Report bugs to "
+msgstr ""
+
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/fid.c:149
 msgid "no file name arguments"
 msgstr "geen bestandsnaam argumenten"
 
-#: src/fid.c:153
+#: src/fid.c:154
 msgid "too many file name arguments"
 msgstr "te veel bestandsnaam argumenten"
 
-#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
+#: src/fid.c:161 src/fnid.c:156 src/lid.c:415
 msgid "can't locate `ID'"
 msgstr "kan `ID' niet vinden"
 
-#: src/fid.c:242
+#: src/fid.c:243
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr "`%s' is dubbelzinnig"
 
-#: src/fid.c:248
+#: src/fid.c:249
 #, c-format
 msgid "`%s' not found"
 msgstr "`%s' niet gevonden"
@@ -515,42 +529,42 @@ msgstr "accolades"
 msgid "space"
 msgstr "spatie"
 
-#: src/lid.c:354
+#: src/lid.c:355
 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:435
+#: src/lid.c:436
 #, 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:470
+#: src/lid.c:471
 #, c-format
 msgid "invalid `--key' style: `%s'"
 msgstr "ongeldige `--key' stijl: `%s'"
 
-#: src/lid.c:482
+#: src/lid.c:483
 #, c-format
 msgid "invalid `--result' style: `%s'"
 msgstr "ongeldige `--result' stijl: `%s'"
 
-#: src/lid.c:639
+#: src/lid.c:640
 #, c-format
 msgid "edit? [y1-9^S/nq] "
 msgstr "bewerken? [j1-9^S/nq]"
 
-#: src/lid.c:708
+#: src/lid.c:709
 msgid "can't fork"
 msgstr "kan geen nieuw proces beginnen"
 
-#: src/lid.c:726
+#: src/lid.c:727
 #, c-format
 msgid "can't exec `%s'"
 msgstr "kan `%s' niet uitvoeren"
 
-#: src/lid.c:867
+#: src/lid.c:868
 msgid "can't match regular-expression: memory exhausted"
 msgstr "kan reguliere expressie niet vergelijken: geheugen vol"
 
@@ -608,102 +622,102 @@ msgstr ""
 "\n"
 "The following arguments apply to the language-specific scanners:\n"
 
-#: src/mkid.c:376
+#: src/mkid.c:377
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr "kan `%s' niet aanmaken in `%s'"
 
-#: src/mkid.c:381
+#: src/mkid.c:382
 #, c-format
 msgid "can't modify `%s'"
 msgstr "kan `%s' niet veranderen"
 
-#: src/mkid.c:458
+#: src/mkid.c:459
 #, c-format
 msgid "can't stat `%s'"
 msgstr "kan de status van `%s' niet opvragen"
 
-#: src/mkid.c:527
+#: src/mkid.c:528
 #, c-format
 msgid "  new = %d/%d"
 msgstr "  nieuw = %d/%d"
 
-#: src/mkid.c:536
+#: src/mkid.c:537
 #, c-format
 msgid "Name=%ld, "
 msgstr "Naam=%ld, "
 
-#: src/mkid.c:537
+#: src/mkid.c:538
 #, c-format
 msgid "Number=%ld, "
 msgstr "Nummer = %ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:539
 #, c-format
 msgid "String=%ld, "
 msgstr "Letterreeks=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:540
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Letterlijk=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:541
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Commentaar=%ld\n"
 
-#: src/mkid.c:542
+#: src/mkid.c:543
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Bestanden=%d, "
 
-#: src/mkid.c:543
+#: src/mkid.c:544
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Eenheden=%ld, "
 
-#: src/mkid.c:544
+#: src/mkid.c:545
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bytes=%ld Kb, "
 
-#: src/mkid.c:545
+#: src/mkid.c:546
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "Data=%ld+%ld Kb, "
 
-#: src/mkid.c:547
+#: src/mkid.c:548
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Uitvoer=%ld (%ld eenheden, %ld gevonden)\n"
 
-#: src/mkid.c:550
+#: src/mkid.c:551
 #, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr ", Freq=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:574
+#: src/mkid.c:575
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Eenheden sorteren...\n"
 
-#: src/mkid.c:580
+#: src/mkid.c:581
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "`%s' schrijven...\n"
 
-#: src/mkid.c:583
+#: src/mkid.c:584
 #, c-format
 msgid "can't create `%s'"
 msgstr "kan `%s' niet aanmaken"
 
-#: src/mkid.c:651
+#: src/mkid.c:652
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:739
+#: src/mkid.c:740
 #, c-format
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld/%ld = %.0f%%\n"
diff --git a/po/pl.po b/po/pl.po
index bb56cd9..46c1fea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-02-15 07:30+0100\n"
+"POT-Creation-Date: 2006-03-12 01:30+0100\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"
@@ -43,7 +43,7 @@ msgstr "Pr�by=%ld/%ld=%.2f, "
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:475 src/xtokid.c:228
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:229
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -325,24 +325,38 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:148
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"Report bugs to "
+msgstr ""
+
+#: src/fid.c:93 src/fnid.c:83 src/lid.c:287 src/mkid.c:178 src/xtokid.c:87
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/fid.c:149
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:153
+#: src/fid.c:154
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
+#: src/fid.c:161 src/fnid.c:156 src/lid.c:415
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:242
+#: src/fid.c:243
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:248
+#: src/fid.c:249
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s: nie odnaleziony\n"
@@ -421,40 +435,40 @@ msgstr ""
 msgid "space"
 msgstr ""
 
-#: src/lid.c:354
+#: src/lid.c:355
 msgid "notice: use of `-e' is deprecated, use `-r' instead"
 msgstr ""
 
-#: src/lid.c:435
+#: src/lid.c:436
 #, 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:470
+#: src/lid.c:471
 #, c-format
 msgid "invalid `--key' style: `%s'"
 msgstr ""
 
-#: src/lid.c:482
+#: src/lid.c:483
 #, c-format
 msgid "invalid `--result' style: `%s'"
 msgstr ""
 
-#: src/lid.c:639
+#: src/lid.c:640
 #, fuzzy, c-format
 msgid "edit? [y1-9^S/nq] "
 msgstr "Edytowa�? [y1-9^S/nq] "
 
-#: src/lid.c:708
+#: src/lid.c:709
 msgid "can't fork"
 msgstr ""
 
-#: src/lid.c:726
+#: src/lid.c:727
 #, c-format
 msgid "can't exec `%s'"
 msgstr ""
 
-#: src/lid.c:867
+#: src/lid.c:868
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
@@ -490,102 +504,102 @@ msgid ""
 "The following arguments apply to the language-specific scanners:\n"
 msgstr ""
 
-#: src/mkid.c:376
+#: src/mkid.c:377
 #, c-format
 msgid "can't create `%s' in `%s'"
 msgstr ""
 
-#: src/mkid.c:381
+#: src/mkid.c:382
 #, c-format
 msgid "can't modify `%s'"
 msgstr ""
 
-#: src/mkid.c:458
+#: src/mkid.c:459
 #, c-format
 msgid "can't stat `%s'"
 msgstr ""
 
-#: src/mkid.c:527
+#: src/mkid.c:528
 #, fuzzy, c-format
 msgid "  new = %d/%d"
 msgstr ", nowy=%d/%d"
 
-#: src/mkid.c:536
+#: src/mkid.c:537
 #, c-format
 msgid "Name=%ld, "
 msgstr "Nazwa=%ld, "
 
-#: src/mkid.c:537
+#: src/mkid.c:538
 #, c-format
 msgid "Number=%ld, "
 msgstr "Numer=%ld, "
 
-#: src/mkid.c:538
+#: src/mkid.c:539
 #, c-format
 msgid "String=%ld, "
 msgstr "�a�cuch=%ld, "
 
-#: src/mkid.c:539
+#: src/mkid.c:540
 #, c-format
 msgid "Literal=%ld, "
 msgstr "Litera�=%ld, "
 
-#: src/mkid.c:540
+#: src/mkid.c:541
 #, c-format
 msgid "Comment=%ld\n"
 msgstr "Komentarz=%ld\n"
 
-#: src/mkid.c:542
+#: src/mkid.c:543
 #, fuzzy, c-format
 msgid "Files=%ld, "
 msgstr "Pliki=%d, "
 
-#: src/mkid.c:543
+#: src/mkid.c:544
 #, c-format
 msgid "Tokens=%ld, "
 msgstr "Znaczniki=%ld, "
 
-#: src/mkid.c:544
+#: src/mkid.c:545
 #, c-format
 msgid "Bytes=%ld Kb, "
 msgstr "Bajty=%ld Kb, "
 
-#: src/mkid.c:545
+#: src/mkid.c:546
 #, fuzzy, c-format
 msgid "Heap=%d+%d Kb, "
 msgstr "Sterta=%ld Kb, "
 
-#: src/mkid.c:547
+#: src/mkid.c:548
 #, c-format
 msgid "Output=%ld (%ld tok, %ld hit)\n"
 msgstr "Wynik=%ld (%ld tok, %ld hit)\n"
 
-#: src/mkid.c:550
+#: src/mkid.c:551
 #, fuzzy, c-format
 msgid ", Freq=%ld/%ld=%.2f\n"
 msgstr "Cz�sto��=%ld/%ld=%.2f\n"
 
-#: src/mkid.c:574
+#: src/mkid.c:575
 #, c-format
 msgid "Sorting tokens...\n"
 msgstr "Sortowanie znacznik�w...\n"
 
-#: src/mkid.c:580
+#: src/mkid.c:581
 #, c-format
 msgid "Writing `%s'...\n"
 msgstr "Zapisuj� `%s'...\n"
 
-#: src/mkid.c:583
+#: src/mkid.c:584
 #, c-format
 msgid "can't create `%s'"
 msgstr ""
 
-#: src/mkid.c:651
+#: src/mkid.c:652
 #, c-format
 msgid "error closing `%s'"
 msgstr ""
 
-#: src/mkid.c:739
+#: src/mkid.c:740
 #, fuzzy, c-format
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "poziom %d: %ld == %ld\n"