From: Bruno Haible <bruno@clisp.org>
Date: Thu, 15 Mar 2001 15:06:04 +0000 (+0000)
Subject: Regenerated.
X-Git-Tag: v0.10.36~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c6b45618110096e408801b2a84a1b9ab251bba;p=thirdparty%2Fgettext.git

Regenerated.
---

diff --git a/po/da.po b/po/da.po
index c96cfbe43..b54996287 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1997-08-29 07:21 MDT\n"
 "Last-Translator: Thorbjoern Ravn Andersen <ravn@mip.ou.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -76,16 +76,12 @@ msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tager ikke et argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "ikke mere ledig hukommelse"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -98,27 +94,27 @@ msgstr ""
 "INGEN garanti -- end ikke for SALGBARHED eller VELEGNETHED TIL NOGET SÆRLIGT\n"
 "FORMÅL.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "argumenter mangler"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Information fås med `%s --help'\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -143,7 +139,7 @@ msgstr ""
 "\n"
 "(TEKSTID svarer til 'msgid' felterne)\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -166,7 +162,7 @@ msgstr ""
 "oversættes de tekster der findes i det valgte tekstkatalog.\n"
 "Standard filkataloget for søgning er: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Rapportér fejl på engelsk til <bug-gnu-utils@gnu.org>.\n"
@@ -740,30 +736,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: advarsel: kildetekstfilen indeholder løse oversættelser (fuzzy)"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -929,5 +929,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "ukendt sprog `%s'"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "ikke mere ledig hukommelse"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: advarsel: \"header\" element ikke angivet"
diff --git a/po/de.po b/po/de.po
index 883a845d4..c3cc4a55f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 2001-03-10 18:19+01:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -81,15 +81,11 @@ msgstr "%s: Option 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 msgid "memory exhausted"
 msgstr "virtueller Speicher erschöpft"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "virtueller Speicher erschöpft"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -102,27 +98,27 @@ msgstr ""
 "Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
 "die VERWENDBARKEIT ZU EINEN ANGEGEBENEN ZWECK.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "Argumente fehlen"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -145,7 +141,7 @@ msgstr ""
 "  [BEREICH] SCHLÜSSEL    die Übersetzung zu SCHLÜSSEL aus dem Namensbereich\n"
 "                           BEREICH holen\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -170,7 +166,7 @@ msgstr ""
 "\n"
 "Standardverzeichnis: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Fehler bitte an <bug-gnu-utils@gnu.org> melden.\n"
@@ -783,16 +779,19 @@ msgstr ""
 "%s: Warnung: Zeichensatz »%s« ist ein nicht portabler Kodierungsname\n"
 "%*s  Warnung: Konvertierung des Zeichensatzes könnte fehlschlagen"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ", Parsing-Fehler sind zu erwarten"
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr "%s: Warnung: Zeichensatz »%s« wird von iconv%s nicht unterstützt"
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
@@ -802,7 +801,8 @@ msgstr ""
 "%*s  Warnung: Empfehlung: Installieren Sie libiconv und installieren Sie\n"
 "        GNU gettext neu"
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
@@ -812,7 +812,7 @@ msgstr ""
 "%*s  Warnung: Empfehlung: Installieren Sie libiconv und installieren Sie\n"
 "        GNU gettext neu"
 
-#: src/po.c:325
+#: src/po.c:330
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -998,6 +998,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "virtueller Speicher erschöpft"
+
 #~ msgid "Try '%s --help' for more information.\n"
 #~ msgstr "»%s --help« gibt weitere Informationen.\n"
 
diff --git a/po/el.po b/po/el.po
index 2bd4481cf..600446b3f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -90,18 +90,13 @@ msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "H ìíÞìç åîáíôëÞèçêå"
 
 #
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "H ìíÞìç åîáíôëÞèçêå"
-
-#
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -115,31 +110,31 @@ msgstr ""
 "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ.\n"
 
 #
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
 
 #
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
 
 #
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -164,7 +159,7 @@ msgstr ""
 "                            óôï MSGID áðü ôï TEXTDOMAIN\n"
 
 #
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -187,7 +182,7 @@ msgstr ""
 "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
 
 #
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
@@ -870,16 +865,19 @@ msgid ""
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
@@ -887,7 +885,8 @@ msgid ""
 msgstr ""
 
 #
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
@@ -896,7 +895,7 @@ msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -1087,6 +1086,10 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
 
+#
+#~ msgid "Memory exhausted"
+#~ msgstr "H ìíÞìç åîáíôëÞèçêå"
+
 #
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: ðñïåéäïðïßçóç: äå âñÝèçêå áñ÷Þ êåöáëßäáò"
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index d0ed1f6af..f99ce08f4 100644
--- 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-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\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"
@@ -100,15 +100,11 @@ msgstr "%s: option ‘-W %s’ is ambiguous\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Memory exhausted"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -120,27 +116,27 @@ 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:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -163,7 +159,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -186,7 +182,7 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -784,16 +780,19 @@ msgstr ""
 "%s: warning: charset “%s” is not a portable encoding name\n"
 "%*s  warning: charset conversion might not work"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ", expect parse errors"
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr "%s: warning: charset “%s” is not supported by iconv%s"
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
@@ -802,7 +801,8 @@ msgstr ""
 "%s: warning: charset “%s” is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
@@ -811,7 +811,7 @@ msgstr ""
 "%s: warning: charset “%s” is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 
-#: src/po.c:325
+#: src/po.c:330
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -979,3 +979,6 @@ msgstr "%s:%d: warning: keyword between outer keyword and its arg"
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
+
+#~ msgid "Memory exhausted"
+#~ msgstr "Memory exhausted"
diff --git a/po/en@quot.po b/po/en@quot.po
index 3626aa195..5ccaae6b4 100644
--- 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-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\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"
@@ -97,15 +97,11 @@ msgstr "%s: option ‘-W %s’ is ambiguous\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Memory exhausted"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -117,27 +113,27 @@ 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:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -160,7 +156,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -183,7 +179,7 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -768,16 +764,19 @@ msgstr ""
 "%s: warning: charset “%s” is not a portable encoding name\n"
 "%*s  warning: charset conversion might not work"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ", expect parse errors"
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr "%s: warning: charset “%s” is not supported by iconv%s"
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
@@ -786,7 +785,8 @@ msgstr ""
 "%s: warning: charset “%s” is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
@@ -795,7 +795,7 @@ msgstr ""
 "%s: warning: charset “%s” is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 
-#: src/po.c:325
+#: src/po.c:330
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -962,3 +962,6 @@ msgstr "%s:%d: warning: keyword between outer keyword and its arg"
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
+
+#~ msgid "Memory exhausted"
+#~ msgstr "Memory exhausted"
diff --git a/po/es.po b/po/es.po
index a75b01b10..1c85e210e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1998-04-29 12:04-0500\n"
 "Last-Translator: Max de Mendizábal <max@tirania.nuclecu.unam.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -81,16 +81,12 @@ msgstr "%s: la opci
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Memoria agotada"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -103,21 +99,21 @@ msgstr ""
 "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
 "FIN DETERMINADO.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -136,7 +132,7 @@ msgstr "Pruebe `%s --help' para m
 # Prefiero que se quede como está, pues aunque se repite muestra,
 # es en otra opción en donde aparece. mm
 #
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -162,7 +158,7 @@ msgstr ""
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
 # no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -186,7 +182,7 @@ msgstr ""
 "encuentre dentro del catálogo seleccionado.\n"
 "Directorio de búsqueda estándar: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
@@ -1077,30 +1073,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -1304,5 +1304,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "lenguaje `%s' desconocido"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Memoria agotada"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: atención: no se encontró la línea de cabecera"
diff --git a/po/fr.po b/po/fr.po
index 78c977f3c..a9582b4a8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1998-05-04 10:03-04:00\n"
 "Last-Translator: François Pinard <pinard@iro.umontreal.ca>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -77,16 +77,12 @@ msgstr "%s: l'option 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Mémoire entièrement consommée"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Mémoire entièrement consommée"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -99,27 +95,27 @@ msgstr ""
 "les permissions de copie.  Il est distribué SANS AUCUNE GARANTIE\n"
 "de QUALITÉ LOYALE ET MARCHANDE ou d'ADÉQUATION POUR UN BUT PARTICULIER.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "arguments manquants"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayer « %s --help ».\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -141,7 +137,7 @@ msgstr ""
 "  -V, --version          identifier le programme, puis terminer\n"
 "  [DOMAINE] MSGID        trouver la traduction de MSGID, dans le DOMAINE donné\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -165,7 +161,7 @@ msgstr ""
 "\n"
 "Ensemble des répertoires fouillés: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
@@ -765,30 +761,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: attention: certaines traductions sont approximatives"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: attention: certaines traductions sont approximatives"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -956,5 +956,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "langage « %s » inconnu"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Mémoire entièrement consommée"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: attention: l'en-tête n'a pas été trouvé"
diff --git a/po/ja.po b/po/ja.po
index 71a0ed66a..d43b97f82 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1999-09-24 23:45+09:00\n"
 "Last-Translator: JUN SAWATAISHI <jsawa@attglobal.net>\n"
 "Language-Team: \n"
@@ -77,15 +77,11 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ƒIƒvƒVƒ‡ƒ“ -W %s ‚͈ø”‚ð‚Æ‚è‚Ü‚¹‚ñ\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 msgid "memory exhausted"
 msgstr "ƒƒ‚ƒŠ[‚ªŒÍŠ‰‚µ‚Ü‚µ‚½"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "ƒƒ‚ƒŠ[‚ªŒÍŠ‰‚µ‚Ü‚µ‚½"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -97,27 +93,27 @@ msgstr ""
 "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·BƒRƒs[‚ÌðŒ‚É‚Â‚¢‚Ă̓\[ƒX‚ðŽQÆ‚Ì‚±‚Æ\n"
 "‚±‚̃\ƒtƒgƒEƒGƒA‚É‚Í‘S‚­•ÛØ‚ª‚ ‚è‚Ü‚¹‚ñ.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s ‚É‚æ‚Á‚ď‘‚©‚ê‚Ü‚µ‚½B\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "ˆø”‚ªŒ‡”@"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "ˆø”‚ª‘½‚·‚¬‚Ü‚·"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "%s --help ‚Å‚æ‚葽‚­‚̏î•ñ‚ª•\Ž¦‚³‚ê‚Ü‚·\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -140,7 +136,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID     MSGID ‚ÉŽ¦‚³‚ê‚é–|–󂳂ꂽƒƒbƒZ[ƒW‚ð\n"
 "                         TEXTDOMAIN ‚©‚瓾‚é\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -163,7 +159,7 @@ msgstr ""
 "ƒƒbƒZ[ƒW‚Í–|–󂳂ê‚Ä‚¢‚é\n"
 "ŒŸõƒfƒBƒŒƒNƒgƒŠ: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "ƒoƒOƒŒƒ|[ƒg‚Í <bug-gnu-utils@gnu.org> ‚Ü‚Å.\n"
@@ -739,16 +735,19 @@ msgstr ""
 "%s: Œx: •¶ŽšƒZƒbƒg\"%s\"‚͉”À«‚Ì‚È‚¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
 "%*s  Œx: •¶ŽšƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
@@ -757,7 +756,8 @@ msgstr ""
 "%s: Œx: •¶ŽšƒZƒbƒg\"%s\"‚͉”À«‚Ì‚È‚¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
 "%*s  Œx: •¶ŽšƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
@@ -766,7 +766,7 @@ msgstr ""
 "%s: Œx: •¶ŽšƒZƒbƒg\"%s\"‚͉”À«‚Ì‚È‚¢ƒGƒ“ƒR[ƒfƒBƒ“ƒO–¼‚Å‚·\n"
 "%*s  Œx: •¶ŽšƒZƒbƒg•ÏŠ·‚Í‚Å‚«‚È‚¢‚©‚à’m‚ê‚Ü‚¹‚ñ"
 
-#: src/po.c:325
+#: src/po.c:330
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -935,5 +935,8 @@ msgstr "%s:%d: 
 msgid "language `%s' unknown"
 msgstr "Œ¾Œê %s ‚ð”FŽ¯‚Å‚«‚Ü‚¹‚ñ"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "ƒƒ‚ƒŠ[‚ªŒÍŠ‰‚µ‚Ü‚µ‚½"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: Œx: ƒwƒbƒ_[ƒGƒ“ƒgƒŠ[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ"
diff --git a/po/ko.po b/po/ko.po
index b15b1aaf7..f71a8cd80 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.30\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1997-09-03 12:52+0900\n"
 "Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -76,16 +76,12 @@ msgstr "%s: `-W %s'
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¿É¼ÇÀº Àμö¸¦ Çã¿ëÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -97,27 +93,27 @@ msgstr ""
 "ÀÌ ÇÁ·Î±×·¥Àº °ø°³ ¼ÒÇÁÆ®¿þ¾îÀÔ´Ï´Ù.  º¹»ç Á¶°ÇÀº ¼Ò½º¸¦ ÂüÁ¶ÇϽʽÿÀ. »óÇ°¼º\n"
 "À̳ª ƯÁ¤ ¸ñÀû¿¡ ´ëÇÑ ÀûÇÕ¼ºÀ» ºñ·ÔÇÏ¿©, ¾î¶°ÇÑ º¸Áõµµ ÇÏÁö ¾Ê½À´Ï´Ù.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s°¡ ¸¸µé¾ú½À´Ï´Ù.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "Àμö°¡ ºüÁ³À½"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -140,7 +136,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        MSGID¿¡ ´ëÀÀÇÏ´Â ¹ø¿ªµÈ ¸Þ½ÃÁö¸¦ TEXTDOMAIN¿¡¼­\n"
 "                            ºÒ·¯¿É´Ï´Ù\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -162,7 +158,7 @@ msgstr ""
 "Ãâ·ÂµË´Ï´Ù.\n"
 "±âº» Ž»ö µð·ºÅ丮: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "<bug-gnu-utils@gnu.org>·Î ¹®Á¦Á¡À» º¸°íÇϽʽÿÀ.\n"
@@ -736,30 +732,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: °æ°í: ¼Ò½º ÆÄÀÏÀÌ ÆÛÁö ¹ø¿ª¹®À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -928,5 +928,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "`%s' ¾ð¾î¸¦ ¾Ë ¼ö ¾øÀ½"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: °æ°í: Çì´õ Ç׸ñÀ» ãÁö ¸øÇßÀ½"
diff --git a/po/nl.po b/po/nl.po
index 7a8670f6d..a9cb9c437 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1997-03-11 22:38 \n"
 "Last-Translator: Erick Branderhorst <Erick.Branderhorst@asml.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -77,16 +77,12 @@ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `-W %s' staat geen argument toe\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Geen geheugen meer beschikbaar"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Geen geheugen meer beschikbaar"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -99,27 +95,27 @@ msgstr ""
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN\n"
 "SPECIFIEK DOEL.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "ontbrekende argumenten"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -142,7 +138,7 @@ msgstr ""
 "  [TEXTDOMEIN] MSGID        ontvang vertaalde meldingen corresponderend aan\n"
 "                            MSGID vanuit TEKSTDOMEIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -165,7 +161,7 @@ msgstr ""
 "worden de in de katalogus gevonden meldingen vertaald.\n"
 "Standaard zoek directory: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Meld fouten via <bug-gnu-utils@gnu.org>.\n"
@@ -745,30 +741,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: let op: broncode bevat vage vertaling"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -938,5 +938,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "taal `%s' onbekend"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Geen geheugen meer beschikbaar"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: let op: geen header ingang gevonden"
diff --git a/po/nn.po b/po/nn.po
index 91879ca86..84a0d2d7f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1996-03-21 08:46 EST\n"
 "Last-Translator: Karl Anders Øygard <karlo@ifi.uio.no>\n"
 "Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -77,15 +77,11 @@ msgstr "%s: flagg 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «--%s» tek ikkje argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 msgid "memory exhausted"
 msgstr ""
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr ""
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -94,28 +90,28 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "manglar argument"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 #, fuzzy
 msgid "too many arguments"
 msgstr "manglar argument"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -138,7 +134,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        hent oversett melding som stemmer overeins med\n"
 "                            MSGID frå TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -161,7 +157,7 @@ msgstr ""
 "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
@@ -717,30 +713,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
diff --git a/po/no.po b/po/no.po
index e4573adad..2e5267358 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1999-08-06 22:38+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
@@ -77,18 +77,14 @@ msgstr "%s: flagg 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Minnet oppbrukt"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Minnet oppbrukt"
-
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -100,27 +96,27 @@ msgstr ""
 "Dette er fri pogramvare; se kildekoden for kopieringsbetingelser.  Det finnes\n"
 "INGEN garanti; ikke engang for SALGBARHET eller SKIKKETHET FOR ET BESTEMT FORMÅL.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "mangler argumenter"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -143,7 +139,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        hent oversatt melding som stemmer overens med MSGID\n"
 "                            fra TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, fuzzy, c-format, no-wrap
 msgid ""
 "\n"
@@ -165,7 +161,7 @@ msgstr ""
 "stedet blir meldinger i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -749,30 +745,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -939,6 +939,9 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "språket «%s» er ukjent"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Minnet oppbrukt"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: advarsel: fant ikke filhode"
 
diff --git a/po/pl.po b/po/pl.po
index 364f00249..2159bfe28 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,14 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.35\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1998-08-05 15:00+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@pdi.net>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -78,16 +79,12 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "pamiêæ wyczerpana"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -100,27 +97,27 @@ msgstr ""
 "Autorzy nie daj± ¯ADNYCH gwarancji, w tym nawet gwarancji SPRZEDAWALNO¦CI\n"
 "lub PRZYDATNO¦CI DO KONKRETNYCH CELÓW.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Zapisane przez %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "brakuj±ce argumenty"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "za du¿o argumentów"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -143,7 +140,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        wydob±d¼ przet³umaczony komunikat odpowiadaj±cy\n"
 "                            MSGID z TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -166,7 +163,7 @@ msgstr ""
 "wybranym katalogu.\n"
 "Domy¶lnie przeszukiwany katalog: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Raporty o b³êdach wysy³aj do bug-gnu-utils@gnu.org\n"
@@ -746,30 +743,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -933,5 +934,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "nieznany jêzyk `%s'"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "pamiêæ wyczerpana"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: uwaga: nie znaleziono nag³ówka"
diff --git a/po/pt.po b/po/pt.po
index 07dec1570..ea0611ed0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -76,17 +76,12 @@ msgstr "%s: a op
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "memória exausta"
 
-#: lib/xmalloc.c:86
-#, fuzzy
-msgid "Memory exhausted"
-msgstr "memória exausta"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -95,27 +90,27 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "argumentos insuficientes"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -138,7 +133,7 @@ msgstr ""
 " [DIALECTO] MSGID          obtém a mensagem traduzida correspondente a\n"
 "                           MSGID do DIALECTO\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -162,7 +157,7 @@ msgstr ""
 "são traduzidas.\n"
 "Directório standard de pesquisa: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
@@ -762,30 +757,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -969,6 +968,10 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Memory exhausted"
+#~ msgstr "memória exausta"
+
 #, fuzzy
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "cuidado: nenhum elemento encontrado no cabeçalho"
diff --git a/po/sl.po b/po/sl.po
index 76304fa11..97a2d9d7f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,14 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.24\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1996-09-12 21:15\n"
 "Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10==2 ? 1 : n%10==3 || n%10==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10==2 ? 1 : n%10==3 || n%"
+"10==4 ? 2 : 3);\n"
 
 #: lib/error.c:115
 msgid "Unknown system error"
@@ -78,18 +79,12 @@ msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira ,--%s' ne dovoljuje argumenta\n"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "pomnilnik izèrpan"
 
-#  Morda ,,Zmanjkalo pomnilnika''?
-#: lib/xmalloc.c:86
-#, fuzzy
-msgid "Memory exhausted"
-msgstr "pomnilnik izèrpan"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -98,27 +93,27 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "argumenti manjkajo"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "preveè argumentov"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite ,%s --help' za izèrpnej¹a navodila\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -141,7 +136,7 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -163,7 +158,7 @@ msgstr ""
 "sporoèil.\n"
 "Privzet imenik s katalogom sporoèil: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
@@ -731,30 +726,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "POZOR: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -918,6 +917,11 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr ""
 
+#  Morda ,,Zmanjkalo pomnilnika''?
+#, fuzzy
+#~ msgid "Memory exhausted"
+#~ msgstr "pomnilnik izèrpan"
+
 #, fuzzy
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "pozor: glava manjka"
diff --git a/po/sv.po b/po/sv.po
index 1671f64f8..9114e2338 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.31\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 1996-12-31 23:59\n"
 "Last-Translator: Jan Djärv <Jan.Djarv@mbox200.swipnet.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -77,16 +77,12 @@ msgstr "%s: flaggan \"-W %s\" 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Minnet slut"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Minnet slut"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -99,27 +95,27 @@ msgstr ""
 "INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
 "ÄNDAMÅL.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skriven av %s.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "argument saknas"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -142,7 +138,7 @@ msgstr ""
 "  [TEXTDOMÄN] MDLID         hämta översatt meddelande som motsvarar\n"
 "                            MDLID från TEXTDOMÄN\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -164,7 +160,7 @@ msgstr ""
 "översätts de argument som hittas i den valda meddelandekatalogen.\n"
 "Normal katalog för meddelandekataloger: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
@@ -743,30 +739,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/po.c:325
+#: src/po.c:330
 #, fuzzy, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -934,5 +934,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "språket \"%s\" okänt"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Minnet slut"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: varning: inga huvudrader funna"
diff --git a/po/tr.po b/po/tr.po
index 39c3323b9..69966b875 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-0.10.35\n"
-"POT-Creation-Date: 2001-03-11 17:25+0100\n"
+"POT-Creation-Date: 2001-03-11 21:31+0100\n"
 "PO-Revision-Date: 2000-11-05 23:43+200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -77,16 +77,12 @@ msgstr "%s: `-W %s' se
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneði bir argümanla kullanýlmaz\n"
 
-#: lib/obstack.c:474
+#: lib/obstack.c:474 lib/xmalloc.c:86
 #, fuzzy
 msgid "memory exhausted"
 msgstr "Bellek tükendi"
 
-#: lib/xmalloc.c:86
-msgid "Memory exhausted"
-msgstr "Bellek tükendi"
-
-#: src/gettext.c:138 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
+#: src/gettext.c:139 src/msgcmp.c:140 src/msgcomm.c:283 src/msgfmt.c:270
 #: src/msgmerge.c:255 src/msgunfmt.c:170 src/xgettext.c:398
 #, c-format, no-wrap
 msgid ""
@@ -99,27 +95,27 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
-#: src/gettext.c:143 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
+#: src/gettext.c:144 src/msgcmp.c:145 src/msgcomm.c:288 src/msgfmt.c:275
 #: src/msgmerge.c:260 src/msgunfmt.c:175 src/xgettext.c:403
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafýndan yazýldý.\n"
 
-#: src/gettext.c:158
+#: src/gettext.c:159
 msgid "missing arguments"
 msgstr "argümankar kayýp"
 
-#: src/gettext.c:168
+#: src/gettext.c:169
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/gettext.c:232 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
+#: src/gettext.c:233 src/msgcmp.c:177 src/msgcomm.c:381 src/msgfmt.c:387
 #: src/msgmerge.c:315 src/msgunfmt.c:205 src/xgettext.c:525
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazýn.\n"
 
-#: src/gettext.c:237
+#: src/gettext.c:238
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
@@ -146,7 +142,7 @@ msgstr ""
 "\t\t\t   MetinSunucu'sundan msgid ile belirtilen\n"
 "\t\t\t   ileti çevirisini alýr.\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid ""
 "\n"
@@ -168,7 +164,7 @@ msgstr ""
 "çevrilmiþ ileti kataloðunun bulunmasý gereken dizini aþaðýdaki gibi verir:\n"
 "Standard arama dizini: %s\n"
 
-#: src/gettext.c:259 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
+#: src/gettext.c:260 src/msgcmp.c:196 src/msgcomm.c:428 src/msgfmt.c:414
 #: src/msgmerge.c:350 src/msgunfmt.c:229 src/xgettext.c:577
 msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr "Hatalarý <bug-gnu-utils@gnu.org> adresine bildirin.\n"
@@ -755,30 +751,34 @@ msgid ""
 "%*s  warning: charset conversion might not work"
 msgstr ""
 
-#: src/po.c:289 src/po.c:316
+#. TRANS: sentence starts at trans_id_1 or trans_id_2
+#: src/po.c:290 src/po.c:321
 msgid ", expect parse errors"
 msgstr ""
 
-#: src/po.c:294
+#. TRANS: sentence trans_id_1 starts here
+#: src/po.c:296
 #, c-format
 msgid "%s: warning: charset \"%s\" is not supported by iconv%s"
 msgstr ""
 
-#: src/po.c:298
+#. TRANS: sentence trans_id_2 starts here
+#: src/po.c:301
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported by iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:312
+#. TRANS: sentence trans_id_3 starts here
+#: src/po.c:316
 #, c-format
 msgid ""
 "%s: warning: charset \"%s\" is not supported without iconv%s\n"
 "%*s  warning: consider installing libiconv and then reinstalling GNU gettext"
 msgstr ""
 
-#: src/po.c:325
+#: src/po.c:330
 #, c-format
 msgid ""
 "%s: warning: charset missing in header\n"
@@ -949,5 +949,8 @@ msgstr ""
 msgid "language `%s' unknown"
 msgstr "lisan `%s' bilinmiyor"
 
+#~ msgid "Memory exhausted"
+#~ msgstr "Bellek tükendi"
+
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: uyarý: baþlýk giriþi bulunamadý"