Update.

diff --git a/po/de.po b/po/de.po
index 846cdadc716b195fc3533091e4c252e4ef242e50..51c185c24a7c6d57ad08f13196c9e0bd5e589b2c 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
-"PO-Revision-Date: 2001-03-20 20:00+01:00\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
+"PO-Revision-Date: 2001-03-24 20:32+01:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -86,8 +86,8 @@ msgstr "%s: Option 
 msgid "memory exhausted"
 msgstr "virtueller Speicher erschöpft"
 
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -99,8 +99,8 @@ msgstr ""
 "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
 "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n"
 
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -113,8 +113,8 @@ msgstr "zu viele Argumente"
 msgid "missing arguments"
 msgstr "Argumente fehlen"
 
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
@@ -167,8 +167,8 @@ msgstr ""
 "\n"
 "Standardverzeichnis: %s\n"
 
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 "Fehler bitte an <bug-gnu-utils@gnu.org> melden.\n"
@@ -241,11 +241,11 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "es ist %d fataler Fehler aufgetreten"
 msgstr[1] "es sind %d fatale Fehler aufgetreten"
 
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
 msgid "duplicate message definition"
 msgstr "Mehrfachdefinition der Meldung"
 
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
 msgid "...this is the location of the first definition"
 msgstr "...dies ist die Stelle der ersten Definition"
 
@@ -256,25 +256,25 @@ msgstr "diese Meldung hat im Bereich 
 
 #. We are about to construct the absolute path to the
 #. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
 msgid "while preparing output"
 msgstr "beim Vorbereiten der Ausgabe"
 
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
 
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
 msgid "at least two files must be specified"
 msgstr "es müssen mindestens zwei Dateien angegeben werden"
 
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -303,7 +303,7 @@ msgstr ""
 "  -F, --sort-by-file         Ausgabe nach Dateivorkommen sortieren\n"
 "  -h, --help                 diese Hilfe anzeigen und beenden\n"
 
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
 msgid ""
 "  -i, --indent                   write the .po file using indented style\n"
 "      --no-location              do not write '#: filename:line' lines\n"
@@ -336,7 +336,7 @@ msgstr ""
 "  -u, --unique               Abkürzung für »--less-than=2«; Meldungen\n"
 "                               anfordern, die nur einmal vorkommen\n"
 
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
 msgid ""
 "  -V, --version                  output version information and exit\n"
 "  -w, --width=NUMBER             set output page width\n"
@@ -375,17 +375,17 @@ msgstr ""
 "Quellen\n"
 "werden für alle PO-Dateien festgehalten.\n"
 
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
 
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
 
@@ -834,7 +834,7 @@ msgstr ""
 "%*s  Warnung: Konvertierung des Zeichensatzes könnte fehlschlagen"
 
 #. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
 msgid ", expect parse errors"
 msgstr ", Parsing-Fehler sind zu erwarten"
 
@@ -846,31 +846,31 @@ msgstr "%s: Warnung: Zeichensatz 
 
 #. TRANS: sentence trans_id_2 starts here
 #: src/po.c:301
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: Warnung: Zeichensatz »%s« wird von iconv%s nicht unterstützt\n"
 "%*s  Warnung: Empfehlung: Installieren Sie GNU libiconv und installieren "
 "Sie\n"
-"        GNU gettext neu"
+"%*s           dann GNU gettext neu"
 
 #. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
-#, fuzzy, c-format
+#: src/po.c:318
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: Warnung: Zeichensatz »%s« wird ohne iconv%s nicht unterstützt\n"
 "%*s  Warnung: Empfehlung: Installieren Sie GNU libiconv und installieren "
 "Sie\n"
-"        GNU gettext neu"
+"%*s           dann GNU gettext neu"
 
-#: src/po.c:330
+#: src/po.c:334
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -916,24 +916,24 @@ msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt beendet"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt beendet"
 
-#: src/xgettext.c:383
+#: src/xgettext.c:373
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
 "geschrieben wird"
 
-#: src/xgettext.c:388
+#: src/xgettext.c:378
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:484
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/xgettext.c:530
+#: src/xgettext.c:520
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -979,15 +979,14 @@ msgstr ""
 "                                   einfügen\n"
 "  -F, --sort-by-file             Ausgabe nach Dateivorkommen sortieren\n"
 
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, fuzzy, no-wrap
 msgid ""
 "  -h, --help                     display this help and exit\n"
 "  -i, --indent                   write the .po file using indented style\n"
 "  -j, --join-existing            join messages with existing file\n"
 "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
 "                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
 "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
 "                                 otherwise is guessed from file extension\n"
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
@@ -1009,7 +1008,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KETTE]    KETTE oder \"\" als Suffix für msgstr nehmen\n"
 "      --no-location              Zeilen mit »#: Datei:Zeilennr.« nicht erzeugen\n"
 
-#: src/xgettext.c:564
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
@@ -1039,19 +1038,19 @@ msgstr ""
 "\n"
 "Wenn EINGABEDATEI »-« ist, wird von Standardeingabe gelesen.\n"
 
-#: src/xgettext.c:926
+#: src/xgettext.c:914
 #, c-format
 msgid "%s:%d: warning: keyword nested in keyword arg"
 msgstr "%s:%d: Warnung: Schlüsselwort in Schlüsselwort-Argument verschachtelt"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:924
 #, c-format
 msgid "%s:%d: warning: keyword between outer keyword and its arg"
 msgstr ""
 "%s:%d: Warnung: Schlüsselwort zwischen äußerem Schlüsselwort und\n"
 "        dessen Argument"
 
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
 #, c-format
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"

diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 9cde50a6a23897584bfc397b417f0fa625bb9115..da5406a7147d17180fd2334e9816eb8d49b73c45 100644 (file)
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -28,7 +28,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
 "PO-Revision-Date: 2001-03-11 00:36+0100\n"
 "Last-Translator: Bruno Haible <haible@clisp.cons.org>\n"
 "Language-Team: English <en@li.org>\n"
@@ -104,8 +104,8 @@ msgstr "%s: option ‘\e[1m-W %s\e[0m’ doesn't allow an argument\n"
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -116,8 +116,8 @@ msgstr ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -130,8 +130,8 @@ msgstr "too many arguments"
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘\e[1m%s --help\e[0m’ for more information.\n"
@@ -182,8 +182,8 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 
@@ -248,11 +248,11 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
 msgid "...this is the location of the first definition"
 msgstr "...this is the location of the first definition"
 
@@ -263,25 +263,25 @@ msgstr "this message has no definition in the “\e[1m%s\e[0m” domain"
 
 #. We are about to construct the absolute path to the
 #. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
 msgid "while preparing output"
 msgstr "while preparing output"
 
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -306,7 +306,7 @@ msgstr ""
 "  -F, --sort-by-file             sort output by file location\n"
 "  -h, --help                     display this help and exit\n"
 
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
 msgid ""
 "  -i, --indent                   write the .po file using indented style\n"
 "      --no-location              do not write '#: filename:line' lines\n"
@@ -342,7 +342,7 @@ msgstr ""
 "  -u, --unique                   shorthand for --less-than=2, requests\n"
 "                                 that only unique messages be printed\n"
 
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
 msgid ""
 "  -V, --version                  output version information and exit\n"
 "  -w, --width=NUMBER             set output page width\n"
@@ -378,17 +378,17 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "preserved.\n"
 
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “\e[1m%s\e[0m” for reading"
 
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
 msgid "no input file given"
 msgstr "no input file given"
 
@@ -716,7 +716,7 @@ msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “\e[1m%s\e[0m” is not in GNU .mo format"
 
 #: src/ngettext.c:209
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -728,18 +728,18 @@ msgid ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+"Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
 "  -E                        (ignored for compatibility)\n"
 "  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
 "  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
+"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+"  COUNT                     choose singular/plural form based on this value\n"
 
 #: src/ngettext.c:221
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "\n"
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -753,9 +753,6 @@ msgstr ""
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the ‘\e[1mecho\e[0m’ command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
 #: src/open-po.c:64
@@ -824,7 +821,7 @@ msgstr ""
 "%*s  warning: charset conversion might not work"
 
 #. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
 msgid ", expect parse errors"
 msgstr ", expect parse errors"
 
@@ -836,29 +833,29 @@ msgstr "%s: warning: charset “\e[1m%s\e[0m” is not supported by iconv%s"
 
 #. TRANS: sentence trans_id_2 starts here
 #: src/po.c:301
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: warning: charset “\e[1m%s\e[0m” is not supported by iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 
 #. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
-#, fuzzy, c-format
+#: src/po.c:318
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: warning: charset “\e[1m%s\e[0m” is not supported without iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 
-#: src/po.c:330
+#: src/po.c:334
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -904,20 +901,20 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/xgettext.c:383
+#: src/xgettext.c:373
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:388
+#: src/xgettext.c:378
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:484
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘\e[1m%s\e[0m’ extension ‘\e[1m%s\e[0m’ is unknown; will try C"
 
-#: src/xgettext.c:530
+#: src/xgettext.c:520
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -956,15 +953,14 @@ msgstr ""
 "      --foreign-user             omit FSF copyright in output for foreign user\n"
 "  -F, --sort-by-file             sort output by file location\n"
 
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, no-wrap
 msgid ""
 "  -h, --help                     display this help and exit\n"
 "  -i, --indent                   write the .po file using indented style\n"
 "  -j, --join-existing            join messages with existing file\n"
 "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
 "                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
 "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
 "                                 otherwise is guessed from file extension\n"
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
@@ -976,14 +972,13 @@ msgstr ""
 "  -j, --join-existing            join messages with existing file\n"
 "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
 "                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
 "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
 "                                 otherwise is guessed from file extension\n"
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 "      --no-location              do not write ‘\e[1m#: filename:line\e[0m’ lines\n"
 
-#: src/xgettext.c:564
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
@@ -1012,17 +1007,17 @@ msgstr ""
 "\n"
 "If INPUTFILE is -, standard input is read.\n"
 
-#: src/xgettext.c:926
+#: src/xgettext.c:914
 #, c-format
 msgid "%s:%d: warning: keyword nested in keyword arg"
 msgstr "%s:%d: warning: keyword nested in keyword arg"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:924
 #, c-format
 msgid "%s:%d: warning: keyword between outer keyword and its arg"
 msgstr "%s:%d: warning: keyword between outer keyword and its arg"
 
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘\e[1m%s\e[0m’ unknown"

diff --git a/po/en@quot.po b/po/en@quot.po
index 92f0c86e3d37964a16d0e6d2cf3c3b83ae39f675..2aa033c7d2c78637ec387afba4472f53e77f008a 100644 (file)
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -25,7 +25,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-03-21 22:47+0100\n"
+"POT-Creation-Date: 2001-03-27 19:25+0200\n"
 "PO-Revision-Date: 2001-03-11 00:36+0100\n"
 "Last-Translator: Bruno Haible <haible@clisp.cons.org>\n"
 "Language-Team: English <en@li.org>\n"
@@ -101,8 +101,8 @@ msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
-#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:398
+#: src/gettext.c:140 src/msgcmp.c:140 src/msgcomm.c:279 src/msgfmt.c:270
+#: src/msgmerge.c:255 src/msgunfmt.c:170 src/ngettext.c:120 src/xgettext.c:388
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -113,8 +113,8 @@ msgstr ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
-#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
-#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:403
+#: src/gettext.c:145 src/msgcmp.c:145 src/msgcomm.c:284 src/msgfmt.c:275
+#: src/msgmerge.c:260 src/msgunfmt.c:175 src/ngettext.c:125 src/xgettext.c:393
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -127,8 +127,8 @@ msgstr "too many arguments"
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
-#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:525
+#: src/gettext.c:245 src/msgcmp.c:177 src/msgcomm.c:377 src/msgfmt.c:387
+#: src/msgmerge.c:315 src/msgunfmt.c:205 src/ngettext.c:204 src/xgettext.c:515
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -179,8 +179,8 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
-#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:577
+#: src/gettext.c:272 src/msgcmp.c:196 src/msgcomm.c:424 src/msgfmt.c:414
+#: src/msgmerge.c:350 src/msgunfmt.c:229 src/ngettext.c:228 src/xgettext.c:565
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 
@@ -245,11 +245,11 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1169
+#: src/msgcmp.c:356 src/msgfmt.c:667 src/msgmerge.c:512 src/xgettext.c:1157
 msgid "duplicate message definition"
 msgstr "duplicate message definition"
 
-#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1170
+#: src/msgcmp.c:357 src/msgfmt.c:669 src/msgmerge.c:513 src/xgettext.c:1158
 msgid "...this is the location of the first definition"
 msgstr "...this is the location of the first definition"
 
@@ -260,25 +260,25 @@ msgstr "this message has no definition in the “%s” domain"
 
 #. We are about to construct the absolute path to the
 #. directory for the output files but asprintf failed.
-#: src/msgcomm.c:236 src/xgettext.c:337 src/xgettext.c:1365
+#: src/msgcomm.c:235 src/xgettext.c:327 src/xgettext.c:1353
 msgid "while preparing output"
 msgstr "while preparing output"
 
-#: src/msgcomm.c:271 src/msgcomm.c:275 src/xgettext.c:375 src/xgettext.c:379
+#: src/msgcomm.c:267 src/msgcomm.c:271 src/xgettext.c:365 src/xgettext.c:369
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgcomm.c:327
+#: src/msgcomm.c:323
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:346
+#: src/msgcomm.c:334
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcomm.c:386
+#: src/msgcomm.c:382
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -303,7 +303,7 @@ msgstr ""
 "  -F, --sort-by-file             sort output by file location\n"
 "  -h, --help                     display this help and exit\n"
 
-#: src/msgcomm.c:398
+#: src/msgcomm.c:394
 msgid ""
 "  -i, --indent                   write the .po file using indented style\n"
 "      --no-location              do not write '#: filename:line' lines\n"
@@ -337,7 +337,7 @@ msgstr ""
 "  -u, --unique                   shorthand for --less-than=2, requests\n"
 "                                 that only unique messages be printed\n"
 
-#: src/msgcomm.c:411
+#: src/msgcomm.c:407
 msgid ""
 "  -V, --version                  output version information and exit\n"
 "  -w, --width=NUMBER             set output page width\n"
@@ -373,17 +373,17 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "preserved.\n"
 
-#: src/msgcomm.c:462 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
-#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:611
+#: src/msgcomm.c:458 src/msgunfmt.c:361 src/po-lex.c:86 src/xget-lex.c:157
+#: src/xget-lex.c:170 src/xget-lex.c:180 src/xgettext.c:599
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
 
-#: src/msgcomm.c:543 src/xgettext.c:653 src/xgettext.c:1071
+#: src/msgcomm.c:539 src/xgettext.c:641 src/xgettext.c:1059
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
 
-#: src/msgfmt.c:286 src/xgettext.c:414
+#: src/msgfmt.c:286 src/xgettext.c:404
 msgid "no input file given"
 msgstr "no input file given"
 
@@ -700,7 +700,7 @@ msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
 #: src/ngettext.c:209
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -712,18 +712,18 @@ msgid ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-"  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+"Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+"  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
 "  -E                        (ignored for compatibility)\n"
 "  -h, --help                display this help and exit\n"
-"  -n                        suppress trailing newline\n"
 "  -V, --version             display version information and exit\n"
-"  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-"                            to MSGID from TEXTDOMAIN\n"
+"  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+"  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
+"  COUNT                     choose singular/plural form based on this value\n"
 
 #: src/ngettext.c:221
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "\n"
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -737,9 +737,6 @@ msgstr ""
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
 "regular directory, another location can be specified with the environment\n"
 "variable TEXTDOMAINDIR.\n"
-"When used with the -s option the program behaves like the ‘echo’ command.\n"
-"But it does not simply copy its arguments to stdout.  Instead those messages\n"
-"found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
 #: src/open-po.c:64
@@ -808,7 +805,7 @@ msgstr ""
 "%*s  warning: charset conversion might not work"
 
 #. TRANS: sentence starts at trans_id_1 or trans_id_2
-#: src/po.c:290 src/po.c:321
+#: src/po.c:290 src/po.c:324
 msgid ", expect parse errors"
 msgstr ", expect parse errors"
 
@@ -820,29 +817,29 @@ msgstr "%s: warning: charset “%s” is not supported by iconv%s"
 
 #. TRANS: sentence trans_id_2 starts here
 #: src/po.c:301
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: warning: charset “%s” is not supported by iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 
 #. TRANS: sentence trans_id_3 starts here
-#: src/po.c:316
-#, fuzzy, c-format
+#: src/po.c:318
+#, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 msgstr ""
 "%s: warning: charset “%s” is not supported without iconv%s\n"
-"%*s  warning: consider installing GNU libiconv and then reinstalling GNU "
-"gettext"
+"%*s  warning: consider installing GNU libiconv and then\n"
+"%*s           reinstalling GNU gettext"
 
-#: src/po.c:330
+#: src/po.c:334
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -887,20 +884,20 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/xgettext.c:383
+#: src/xgettext.c:373
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:388
+#: src/xgettext.c:378
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:494
+#: src/xgettext.c:484
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:530
+#: src/xgettext.c:520
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -939,15 +936,14 @@ msgstr ""
 "      --foreign-user             omit FSF copyright in output for foreign user\n"
 "  -F, --sort-by-file             sort output by file location\n"
 
-#: src/xgettext.c:550
-#, c-format, no-wrap
+#: src/xgettext.c:540
+#, no-wrap
 msgid ""
 "  -h, --help                     display this help and exit\n"
 "  -i, --indent                   write the .po file using indented style\n"
 "  -j, --join-existing            join messages with existing file\n"
 "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
 "                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
 "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
 "                                 otherwise is guessed from file extension\n"
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
@@ -959,14 +955,13 @@ msgstr ""
 "  -j, --join-existing            join messages with existing file\n"
 "  -k, --keyword[=WORD]           additonal keyword to be looked for (without\n"
 "                                 WORD means not to use default keywords)\n"
-"  -l, --string-limit=NUMBER      set string length limit to NUMBER instead %u\n"
 "  -L, --language=NAME            recognise the specified language (C, C++, PO),\n"
 "                                 otherwise is guessed from file extension\n"
 "  -m, --msgstr-prefix[=STRING]   use STRING or \"\" as prefix for msgstr entries\n"
 "  -M, --msgstr-suffix[=STRING]   use STRING or \"\" as suffix for msgstr entries\n"
 "      --no-location              do not write ‘#: filename:line’ lines\n"
 
-#: src/xgettext.c:564
+#: src/xgettext.c:552
 #, no-wrap
 msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
@@ -995,17 +990,17 @@ msgstr ""
 "\n"
 "If INPUTFILE is -, standard input is read.\n"
 
-#: src/xgettext.c:926
+#: src/xgettext.c:914
 #, c-format
 msgid "%s:%d: warning: keyword nested in keyword arg"
 msgstr "%s:%d: warning: keyword nested in keyword arg"
 
-#: src/xgettext.c:936
+#: src/xgettext.c:924
 #, c-format
 msgid "%s:%d: warning: keyword between outer keyword and its arg"
 msgstr "%s:%d: warning: keyword between outer keyword and its arg"
 
-#: src/xgettext.c:1432
+#: src/xgettext.c:1420
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"