diff --git a/po/de.po b/po/de.po
line changes: +52/-46
index d6135d9..394e6b2
--- a/po/de.po
+++ b/po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.93\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-10-17 17:05+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Zu viele Parameter\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "Dies ist »GNU Hello«, DAS Willkommen-sag-Programm.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hallo, Welt\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"╔══════════════╗\n"
+"║ Hallo, Welt! ║\n"
+"╚══════════════╝\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hallo, Welt!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Syntax: %s [OPTION]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,26 +73,27 @@ msgstr ""
 "  -h, --help          Diese Hilfe anzeigen\n"
 "  -v, --version       Programmversion anzeigen\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
 "  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       Traditionelles Willkommensformat verwenden\n"
-"  -n, --next-generation   Willkommenformat der „Nächsten Generation“ verwenden\n"
+"  -n, --next-generation   Willkommenformat der „Nächsten Generation“ "
+"verwenden\n"
 "  -g, --greeting=TEXT     TEXT als Willkommensmeldung verwenden\n"
 
 # Add address for the german translation.
 # 2000-03-13 05:50:49 CET -ke-
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""

@@ -74,39 +101,14 @@ msgstr ""
 "Für die Verbesserung der deutschen Programm-Meldungen ist die Mailingliste\n"
 "<de@li.org> zuständig.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "License: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
-"This is free software.  There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hallo, Welt\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+"This is free software.  There is NO WARRANTY, to the extent permitted by "
+"law.\n"
 msgstr ""
-"╔══════════════╗\n"
-"║ Hallo, Welt! ║\n"
-"╚══════════════╝\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hallo, Welt!"
 
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"

@@ -206,10 +208,14 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Arbeitsspeicher voll.\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "Dies ist »GNU Hello«, DAS Willkommen-sag-Programm.\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the terms\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the "
+#~ "terms\n"
 #~ "of the GNU General Public License.\n"
 #~ "For more information about these matters, see the file named COPYING.\n"
 #~ msgstr ""

diff --git a/po/de_DE.po b/po/de_DE.po
line changes: +44/-41
index 5a46902..ad8e7d8
--- a/po/de_DE.po
+++ b/po/de_DE.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 1.3.26\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-01 21:43+0100\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"

@@ -15,32 +15,54 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Zu viele Parameter\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-# Dt. Anführungszeichen :)
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "Dies ist „GNU Hello“, DAS Willkommen-sag-Programm.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hallo, Welt\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hallo, Welt!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Syntax: %s [OPTION]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +70,9 @@ msgstr ""
 "  -h, --help          Diese Hilfe anzeigen.\n"
 "  -v, --version       Programmversion anzeigen.\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -64,10 +86,10 @@ msgstr ""
 # 2000-03-13 05:50:49 CET -ke-
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""

@@ -75,7 +97,7 @@ msgstr ""
 "Für die Verbesserung der deutschen Programm-Meldungen ist die Mailingliste\n"
 "<de@li.org> zuständig.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -84,29 +106,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hallo, Welt\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hallo, Welt!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +204,10 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Arbeitsspeicher voll.\n"
 
+# Dt. Anführungszeichen :)
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "Dies ist „GNU Hello“, DAS Willkommen-sag-Programm.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/el.po b/po/el.po
line changes: +39/-39
index 487a377..dfa786c
--- a/po/el.po
+++ b/po/el.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.21\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2001-03-19 06:34+01:00\n"
 "Last-Translator: Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
 "Language-Team: Greek <S.Xenitellis@rhbnc.ac.uk>\n"

@@ -14,39 +14,62 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "���� ����� ��������\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������������ �����������\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "���� ���, �����\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "���� ���, �����!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -55,15 +78,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -72,29 +95,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "���� ���, �����\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "���� ���, �����!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

diff --git a/po/eo.po b/po/eo.po
line changes: +46/-43
index 2330585..09282b4
--- a/po/eo.po
+++ b/po/eo.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-08-29 10:14+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Tro da argumentoj\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, LA salut-eltajpa programo.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "saluton, mondo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------------+\n"
+"| Saluton, mondo! |\n"
+"+-----------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Saluton, mondo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uzado: %s [OPCIO]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          montri ĉi tiun helpon kaj eliri\n"
 "  -v, --version       montri version kaj eliri\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -60,15 +86,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Raportu cimojn al <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -81,32 +107,6 @@ msgstr ""
 "Ĉi tio estas libera programo. Estas NENIA GARANTIO, laŭ la grado leĝe "
 "permesata.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "saluton, mondo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------+\n"
-"| Saluton, mondo! |\n"
-"+-----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Saluton, mondo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"

@@ -203,6 +203,9 @@ msgstr "”"
 msgid "memory exhausted"
 msgstr "memoro elĉerpiĝis"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, LA salut-eltajpa programo.\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"

diff --git a/po/es.po b/po/es.po
line changes: +46/-43
index d11d86b..563b6ad
--- a/po/es.po
+++ b/po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-06-20 16:02+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para m�s informaci�n.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, EL programa que imprime un saludo.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hola mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| �Hola, mundo! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "�Hola mundo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Modo de empleo: %s [OPCI�N]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          muestra esta ayuda y finaliza\n"
 "  -v, --version       muestra informaci�n sobre la versi�n y termina\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,17 +89,17 @@ msgstr ""
 # V�ase "A bug's life".
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Comunicar bichos a <%s>.\n"
 "Comunicar errores de traducci�n a <es@li.org>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hola mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| �Hola, mundo! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "�Hola mundo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +205,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memoria agotada\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, EL programa que imprime un saludo.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/es_AR.po b/po/es_AR.po
line changes: +46/-43
index babd8e4..ef564d3
--- a/po/es_AR.po
+++ b/po/es_AR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-11-03 18:02+0100\n"
 "Last-Translator: Cesar H. Roldan <cesar@hugoroldan.com.ar>\n"
 "Language-Team: es_AR <??????>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Utilizar `%s --help' para mayor informacion\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, EL programa de impresion del saludo\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hola, mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------+\n"
+"| Hola, mundo! |\n"
+"+--------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hola, mundo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Usar: %s [OPCION]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          muestra esta ayuda y termina\n"
 "  -v, --version       muestra la informacion de la version y termina\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,15 +89,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Reportar fallas a <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -80,32 +106,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hola, mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------+\n"
-"| Hola, mundo! |\n"
-"+--------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hola, mundo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -203,6 +203,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memoria virtual agotada\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, EL programa de impresion del saludo\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/et.po b/po/et.po
line changes: +46/-43
index d98a1ea..f4c70dd
--- a/po/et.po
+++ b/po/et.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-02 20:01+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, programm, mis tr�kib tervitusi.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "tere k�ik\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------+\n"
+"| Tere k�ik |\n"
+"+-----------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Tere k�ik!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kasuta: %s [V�TI]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          esita see abiinfo ja l�peta t��\n"
 "  -v, --version       esita versiooniinfo ja l�peta t��\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,15 +87,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Palun teatage vigadest aadressile <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -78,32 +104,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "tere k�ik\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------+\n"
-"| Tere k�ik |\n"
-"+-----------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Tere k�ik!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -201,6 +201,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: M�lu on otsas\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, programm, mis tr�kib tervitusi.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/eu.po b/po/eu.po
line changes: +46/-43
index 8420e49..a352c8f
--- a/po/eu.po
+++ b/po/eu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2003-12-02 14:36+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@euskal.org>\n"
 "Language-Team: Basque <linux-eu@chanae.alphanet.ch>\n"

@@ -17,31 +17,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Argumentu gehiegi\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Saiatu `%s --help' -rekin informazio gehiagorako.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, ongietorri programa.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "kaixo, mundu\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Kaixo, mundu! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Kaixo, mundu!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Erabilpena: %s [AUKERA]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -50,9 +76,9 @@ msgstr ""
 "  -v, --version       bertsioari buruzko informazioa erakutsi eta irten "
 "egiten da\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -65,15 +91,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Bug-ak <%s>ra bidali.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "kaixo, mundu\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Kaixo, mundu! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Kaixo, mundu!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +205,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memori birtuala agortua\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, ongietorri programa.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/fa.po b/po/fa.po
line changes: +46/-43
index 7fb4c5b..471fc32
--- a/po/fa.po
+++ b/po/fa.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-12-07 06:21+0100\n"
 "Last-Translator: Behdad Esfahbod <trans@behdad.org>\n"
 "Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "آرگومان‌ها خیلی زیادند\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "برای اطلاعات بیشتر «%s --help» را امتحان کنید.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "گنو سلام، برنامه‌ی خوش‌آمدگویی.                                \n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "سلام بر همه\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"‏‎╔═════════════╗‎\n"
+"║ سلام بر همه! ║\n"
+"‏‎╚═════════════╝‎\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "سلام بر همه!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "طرز استفاده: ‪%s [گزینه]‏‬                                    \n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help           این راهنما را نشان می‌دهد و خارج می‌شود\n"
 "  -v, --version       شماره‌ی نسخه را نشان می‌دهد و خارج می‌شود\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,17 +87,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "اشکال‌های برنامه را به <%s>،              \n"
 "و اشکال‌های ترجمه را به <fwpg@sharif.edu> گزارش دهید.        \n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -80,32 +106,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "سلام بر همه\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"‏‎╔═════════════╗‎\n"
-"║ سلام بر همه! ║\n"
-"‏‎╚═════════════╝‎\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "سلام بر همه!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -203,6 +203,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: حافظه‌ی مجازی تمام شد\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "گنو سلام، برنامه‌ی خوش‌آمدگویی.                                \n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/fi.po b/po/fi.po
line changes: +46/-43
index 84cdac3..698c391
--- a/po/fi.po
+++ b/po/fi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-08-28 17:24+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Liian monta argumenttia\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisätietoja saat komennolla \"%s --help\"\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, SE tervehdyksen tulostusohjelma.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "terve maailma\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+----------------+\n"
+"| Terve maailma! |\n"
+"+----------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Terve maailma!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Käyttö: %s [VALITSIN]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          näyttää tämän ohjeen ja poistuu\n"
 "  -v, --version       näyttää versiotiedot ja poistuu\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -60,17 +86,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Kerro vioista (englanniksi) osoitteeseen <%s>.  Suomennoksen vioista\n"
 "voit ilmoittaa listalle <translation-team-fi@lists.sourceforge.net>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -83,32 +109,6 @@ msgstr ""
 "Tämä on vapaa ohjelmisto. Tälle ohjelmistolle EI myönnetä takuuta lain\n"
 "sallimissa rajoissa.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "terve maailma\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+----------------+\n"
-"| Terve maailma! |\n"
-"+----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Terve maailma!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmävirhe"

@@ -205,6 +205,9 @@ msgstr "”"
 msgid "memory exhausted"
 msgstr "muisti loppui"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, SE tervehdyksen tulostusohjelma.\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"

diff --git a/po/fr.po b/po/fr.po
line changes: +46/-43
index 5c55edc..e07e057
--- a/po/fr.po
+++ b/po/fr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-08-04 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Trop de param�tres.\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'informations, faire: � %s --help �.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, LE programme de salutations et de bienvenue.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "Bonjour, le monde.\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------------+\n"
+"| Bonjour, le monde! |\n"
+"+--------------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Bonjour, le monde!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Usage: %s [OPTION]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          afficher l'aide-m�moire\n"
 "  -v, --version       afficher le nom et la version du logiciel\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapporter toutes anomalies � <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "Bonjour, le monde.\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------------+\n"
-"| Bonjour, le monde! |\n"
-"+--------------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Bonjour, le monde!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: m�moire virtuelle �puis�e\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, LE programme de salutations et de bienvenue.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/ga.po b/po/ga.po
line changes: +46/-43
index 742477b..aadb0c9
--- a/po/ga.po
+++ b/po/ga.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-08-25 15:48-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "An iomarca arg�int�\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fh�il.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, n�l r�omhchl�r eile chun priont�il beannachta�!\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "Dia duit, a dhomhain\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------------------+\n"
+"| Dia duit, a dhomhain! |\n"
+"+-----------------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Dia duit, a dhomhain!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "�s�id: %s [ROGHA]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          taispe�in an chabhair seo agus scoir\n"
 "  -v, --version       taispe�in eolas faoin leagan agus scoir\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -61,15 +87,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Seol tuairisc� fabhtanna chuig <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgstr ""
 "Is saorbhogearra � seo.  N�l bar�nta AR BITH ann, an oiread at� ceadaithe de "
 "r�ir dl�.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "Dia duit, a dhomhain\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------------+\n"
-"| Dia duit, a dhomhain! |\n"
-"+-----------------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Dia duit, a dhomhain!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Earr�id anaithnid ch�rais"

@@ -204,6 +204,9 @@ msgstr "'"
 msgid "memory exhausted"
 msgstr "cuimhne �dithe"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, n�l r�omhchl�r eile chun priont�il beannachta�!\n"
+
 #~ msgid "%s: Incompatible flags: -m and -t\n"
 #~ msgstr "%s: Bratacha �aguibhreannacha: -m agus -t\n"
 

diff --git a/po/gl.po b/po/gl.po
line changes: +46/-43
index 8a72484..0f8a2a9
--- a/po/gl.po
+++ b/po/gl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-03-18 17:00+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@iname.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Escriba `%s --help' para obter m�is informaci�n.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, *O* programa que amosa sa�dos.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "ola, mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------+\n"
+"| �Ola, mundo! |\n"
+"+--------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "�Ola, mundo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Emprego: %s [OPCI�N]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          amosar esta axuda e sa�r\n"
 "  -v, --version       amosar informaci�n sobre a versi�n e sa�r\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,17 +87,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Informe dos erros no programa a <%s>.\n"
 "Informe dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -80,32 +106,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "ola, mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------+\n"
-"| �Ola, mundo! |\n"
-"+--------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "�Ola, mundo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -203,6 +203,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memoria virtual esgotada\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, *O* programa que amosa sa�dos.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/he.po b/po/he.po
line changes: +46/-43
index 459a43c..eb7475b
--- a/po/he.po
+++ b/po/he.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-02 21:35+0200\n"
 "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
 "Language-Team: Hebrew <eliz@gnu.org>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "��������� ��� ����\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ".���� �� ���� ����� `%s --help' ����� ���\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr ".���� ������ �������� �� ,GNU hello\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "!����� ��� ����\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------------+\n"
+"| !����� ��� ���� |\n"
+"+-----------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "!����� ��� ����"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "%s [��������]  :����� ����\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "               .�������� ��� �� ���� ��� ���       -h, --help\n"
 "           .�������� ��� ������ ����� �� ���       -v, --version\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,15 +87,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -78,32 +104,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "!����� ��� ����\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------+\n"
-"| !����� ��� ���� |\n"
-"+-----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "!����� ��� ����"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -201,6 +201,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s ����� ���� �������� ������ ����\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr ".���� ������ �������� �� ,GNU hello\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/hr.po b/po/hr.po
line changes: +46/-43
index 8b1ea87..be5d58b
--- a/po/hr.po
+++ b/po/hr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-04-30 11:59+MET/DST (UTC+2)\n"
 "Last-Translator: Mirsad Todorovac <mtodorov_69@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"

@@ -18,31 +18,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Prevelik broj argumenata\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poku�aj `%s --help' za vi�e informacija.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, pozdravni program.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "pozdrav, svijete\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-------------------+\n"
+"| Pozdrav, svijete! |\n"
+"+-------------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Pozdrav, svijete!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kori�tenje: %s [OPCIJA]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -50,9 +76,9 @@ msgstr ""
 "  -h, --help          prika�i ovu pomo� i zavr�i s radom.\n"
 "  -v, --version       prika�i informaciju o verziji programa i zavr�i.\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -65,15 +91,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "pozdrav, svijete\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-------------------+\n"
-"| Pozdrav, svijete! |\n"
-"+-------------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +205,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Iscrpljena virtualna memorija\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, pozdravni program.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/hu.po b/po/hu.po
line changes: +46/-43
index 43724de..e9e0718
--- a/po/hu.po
+++ b/po/hu.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-03-09 15:57+0100\n"
 "Last-Translator: Emese Kovacs <emese@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "T�l sok argumentum\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�b�ld a `%s --help'-et.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, AZ �dv�zletki�r� program.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "szia, vil�g\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"|  Szia Vil�g!  |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Szia Vil�g!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Haszn�lat: %s [KAPCSOL�]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help              eml�keztet�t �r ki\n"
 "  -v, --version           ki�rja a program nev�t �s verzi�j�t\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,10 +87,10 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""

@@ -72,7 +98,7 @@ msgstr ""
 "A ford�t�ssal kapcsolatos �szrev�teleket a \n"
 "<translation-team-hu@lists.sourceforge.net> c�mre v�rjuk.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -81,32 +107,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "szia, vil�g\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"|  Szia Vil�g!  |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Szia Vil�g!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -204,6 +204,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: a virtu�lis mem�ria elfogyott\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, AZ �dv�zletki�r� program.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/id.po b/po/id.po
line changes: +46/-43
index e3bcedf..3cd78bb
--- a/po/id.po
+++ b/po/id.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-09-27 20:12+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_heriyanto@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"

@@ -18,31 +18,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Terlalu banyak argumen\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, Program pencetak salam.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hello, world\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hello, world!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Pemakaian: %s [OPTION]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -50,9 +76,9 @@ msgstr ""
 "  -h, --help          tampilkan bantuan ini dan keluar\n"
 "  -v, --version       tampilkan informasi versi dan keluar\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -64,15 +90,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Laporkan bug ke <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -85,32 +111,6 @@ msgstr ""
 "This is free software.  There is NO WARRANTY, to the extent permitted by "
 "law.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hello, world\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hello, world!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tidak dikenal"

@@ -206,3 +206,6 @@ msgstr "'"
 #: gnulib/lib/xalloc-die.c:37
 msgid "memory exhausted"
 msgstr "memori habis"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, Program pencetak salam.\n"

diff --git a/po/it.po b/po/it.po
line changes: +46/-43
index c646b67..dc61e18
--- a/po/it.po
+++ b/po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.37\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-01 12:17+0100\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Troppi argomenti\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare `%s --help' per ulteriori informazioni.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, IL programma che stampa i saluti.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "salve, mondo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Salve, mondo! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Salve, mondo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONI]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -v, --version       mostra informazioni sulla versione ed esce\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Segnalare i bug a <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "salve, mondo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Salve, mondo! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Salve, mondo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memoria virtuale esaurita\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, IL programma che stampa i saluti.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/ja.po b/po/ja.po
line changes: +46/-43
index b8f6653..8a34981
--- a/po/ja.po
+++ b/po/ja.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-08 12:19+09:00\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <ja@li.org>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "������¿�����ޤ�\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' �ǡ����ܺ٤ʾ����Ĵ�٤ƤߤƤ���������\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "*����*��������ɽ���ץ�����ࡢHello �� GNU �ǤǤ���\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "�����衢����ˤ���\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"������������������������\n"
+"�������衢����ˤ��ϡ���\n"
+"������������������������\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "�����衢����ˤ��ϡ�"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "����ˡ: %s [���ץ����]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          ���Υ�å�������ɽ�����ơ���λ���ޤ�\n"
 "  -v, --version       �С����������ɽ�����ơ���λ���ޤ�\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,17 +88,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "�Х��򸫤Ĥ����� <%s> ����𤷤Ƥ���������\n"
 "���ܸ�θ����� <ja@li.org> ����𤷤Ƥ���������\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -81,32 +107,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "�����衢����ˤ���\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"������������������������\n"
-"�������衢����ˤ��ϡ���\n"
-"������������������������\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "�����衢����ˤ��ϡ�"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -204,6 +204,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: ���ۥ����Ȥ��̤����ޤ���\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "*����*��������ɽ���ץ�����ࡢHello �� GNU �ǤǤ���\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/ka.po b/po/ka.po
line changes: +46/-43
index be5eb64..11a7d9d
--- a/po/ka.po
+++ b/po/ka.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2003-02-25 13:00+0400\n"
 "Last-Translator: Nugzar Nebieridze <nugzar@nebieridze.com>\n"
 "Language-Team: Georgian <ka@li.org>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "ზედმეტი პარამეტრები\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "აკრიბეთ `%s --help' დამატებითი ინფორმაციისთვის.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, მისალმების პროგრამა.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "სალამი მსოფლიოს!\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+------------------+\n"
+"| სალამი მსოფლიოს! |\n"
+"+------------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "სალამი მსოფლიოს!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "გამოძახება: %s [პარამეტრი]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          ამ დახმარების ჩვენება და პროგრამიდან გამოსვლა\n"
 "  -v, --version       ვერსიის ჩვენება და პროგრამიდან გამოსვლა\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,15 +87,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -78,32 +104,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "სალამი მსოფლიოს!\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+------------------+\n"
-"| სალამი მსოფლიოს! |\n"
-"+------------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "სალამი მსოფლიოს!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -201,6 +201,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: ვირტუალური მეხსიერება ამოწურულია\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, მისალმების პროგრამა.\n"
+
 #~ msgid "%s: Incompatible flags: -m and -t\n"
 #~ msgstr "%s: არათავსებადი პარამეტრები: -m და -t\n"
 

diff --git a/po/ko.po b/po/ko.po
line changes: +46/-43
index 38b5aee..43708a9
--- a/po/ko.po
+++ b/po/ko.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 1.3.37\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-01 20:42+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <ko@li.org>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "�μ��� �ʹ� �����ϴ�\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "�� ���� ������ ������ `%s --help' �Ͻʽÿ�.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, �λ縻�� ����ϴ� �ٷ� \"��\" ���α׷��Դϴ�.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "�ȳ�, ������\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| �ȳ�, ������!  |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "�ȳ��ϼ���, ������!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "����: %s [�ɼ�]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          �� ������ ����ϰ� ��Ĩ�ϴ�\n"
 "  -v, --version       ���� ������ ǥ���ϰ� ��Ĩ�ϴ�\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "���׸� %s��(����) �˷� �ּ���.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "�ȳ�, ������\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| �ȳ�, ������!  |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "�ȳ��ϼ���, ������!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: ���� �޸𸮰� �ٴڳ�\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, �λ縻�� ����ϴ� �ٷ� \"��\" ���α׷��Դϴ�.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/lv.po b/po/lv.po
line changes: +39/-39
index 1850d06..b1d8390
--- a/po/lv.po
+++ b/po/lv.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 1.3.23\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 1999-07-30 14:17 +0200\n"
 "Last-Translator: Ilya Ketris <ilya@gde.to>\n"
 "Language-Team: Latvian <translations@lv.quite.net>\n"

@@ -14,39 +14,62 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Par daudz argumentu.\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Izpildiet \"%s --help\" t�l�kai inform�cijai.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "sveika, pasaule\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Sveika, pasaule!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -55,15 +78,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -72,29 +95,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "sveika, pasaule\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Sveika, pasaule!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

diff --git a/po/nb.po b/po/nb.po
line changes: +46/-43
index 4816491..8333f7b
--- a/po/nb.po
+++ b/po/nb.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2004-02-13 23:59+0100\n"
 "Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v med �%s --help� for mer informasjon.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, Det utimate hilsningsskriveprogrammet.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hei, verden\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------+\n"
+"| Hei, verden! |\n"
+"+--------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hei, verden!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruk: %s [FLAGG]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          vis denne hjelpteksten og avslutt\n"
 "  -V, --version       vis versjonsinformasjon og avslutt\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Rapporter feil til <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hei, verden\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------+\n"
-"| Hei, verden! |\n"
-"+--------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hei, verden!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Virtuelt minne oppbrukt\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, Det utimate hilsningsskriveprogrammet.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/nl.po b/po/nl.po
line changes: +47/-44
index 6b48d09..167c0b1
--- a/po/nl.po
+++ b/po/nl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-02 19:28+0100\n"
 "Last-Translator: Ivo Timmermans <ivo@debian.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"

@@ -15,31 +15,58 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Te veel argumenten\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, HET groet programma.\n"
+# Ima to smisel prevajati? :-)
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hallo, wereld\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+----------------+\n"
+"| Hallo, wereld! |\n"
+"+----------------+\n"
+
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hallo, wereld!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIE]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +74,9 @@ msgstr ""
 "  -h, --help          geef deze hulp en be�indig\n"
 "  -v, --version       geef versie-informatie en be�indig\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,17 +89,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Meld fouten in het programma aan <%s>;\n"
 "meld fouten in de vertaling aan <vertaling@nl.linux.org>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -81,33 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-# Ima to smisel prevajati? :-)
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hallo, wereld\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+----------------+\n"
-"| Hallo, wereld! |\n"
-"+----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hallo, wereld!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -206,6 +206,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Geen geheugen meer beschikbaar\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, HET groet programma.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/nn.po b/po/nn.po
line changes: +46/-43
index 49b6f0a..0683feb
--- a/po/nn.po
+++ b/po/nn.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 1.3.37\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-02 17:10+0100\n"
 "Last-Translator: Kjetil Torgrim Homme <kjetilho@linpro.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"

@@ -16,31 +16,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "For mange argument\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v �%s --help� for meir informasjon.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, det BESTE programmet til � skriva helsingar.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hei, verda\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"|  Hei, verda!  |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hei, verda!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruk: %s [FLAGG]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 "  -h, --help          vis denne hjelpeteksten og avslutt\n"
 "  -v, --version       vis programversjon og avslutt\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,17 +89,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Rapporter programfeil til <%s>.\n"
 "Feil i den norske teksten kan meldast til <i18n-nn@lister.ping.uio.no>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hei, verda\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"|  Hei, verda!  |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hei, verda!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +205,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Virtuelt minne oppbrukt\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, det BESTE programmet til � skriva helsingar.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/pl.po b/po/pl.po
line changes: +47/-44
index 2cd0f63..2d06bef
--- a/po/pl.po
+++ b/po/pl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-08-26 16:00+0200\n"
 "Last-Translator: Rafa� Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"

@@ -16,31 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Za du�o argument�w\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "U�yj `%s --help' dla uzyskania informacji.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, program wypisuj�cy pozdrowienie.\n"
+# Ima to smisel prevajati? :-)
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "witaj �wiecie\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+----------------+\n"
+"| Witaj �wiecie! |\n"
+"+----------------+\n"
+
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Witaj �wiecie!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Sk�adnia: %s [OPCJA]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +75,9 @@ msgstr ""
 "  -h, --help          wy�wietlenie tego opisu i zako�czenie\n"
 "  -v, --version       wy�wietlenie numeru wersji i zako�czenie\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -62,15 +89,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Raporty o b��dach prosz� wysy�a� do %s .\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -84,33 +111,6 @@ msgstr ""
 "granicach\n"
 "dozwolonych prawem.\n"
 
-# Ima to smisel prevajati? :-)
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "witaj �wiecie\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+----------------+\n"
-"| Witaj �wiecie! |\n"
-"+----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Witaj �wiecie!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Nieznany b��d systemu"

@@ -207,3 +207,6 @@ msgstr "\""
 #: gnulib/lib/xalloc-die.c:37
 msgid "memory exhausted"
 msgstr "pami�� wyczerpana"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, program wypisuj�cy pozdrowienie.\n"

diff --git a/po/pt.po b/po/pt.po
line changes: +39/-39
index c0f4c3a..8654043
--- a/po/pt.po
+++ b/po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.4\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 1996-04-29 10:35\n"
 "Last-Translator: Ant�nio Jo�o Rendas <arendas@telepac.pt>\n"
 "Language-Team: Portugu�s <pt@li.org>\n"

@@ -14,39 +14,62 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usa `%s --help' para mais informa��o\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "ol�, mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Ol�, mundo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
 msgstr ""
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -55,15 +78,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -72,29 +95,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "ol�, mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Ol�, mundo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
line changes: +46/-43
index 0b02059..7be53e1
--- a/po/pt_BR.po
+++ b/po/pt_BR.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-10-29 21:15-0200\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"

@@ -16,31 +16,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Argumentos demais\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para maiores informa��es.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, `O' programa de impress�o de sauda��o.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "bom dia, mundo\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------------+\n"
+"| Bom dia, mundo! |\n"
+"+-----------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Bom dia, mundo!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OP��O]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 "  -h, --help          mostra esta ajuda e sai\n"
 "  -v, --version       mostra informa��es sobre a vers�o e sai\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,17 +89,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Reporte erros para <%s>.\n"
 "Reporte erros da tradu��o para <afmenez@terra.com.br>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,32 +108,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "bom dia, mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------+\n"
-"| Bom dia, mundo! |\n"
-"+-----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Bom dia, mundo!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -205,6 +205,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Mem�ria virtual esgotada\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, `O' programa de impress�o de sauda��o.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/ro.po b/po/ro.po
line changes: +46/-43
index 8b4002a..6d305c1
--- a/po/ro.po
+++ b/po/ro.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2003-04-19 09:20+0300\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Prea mul�i parametri\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, programul de tip�rire al saluturilor\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hello, world\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hello, world!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Folosire: %s [OP�IUNE]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          afi�eaz� acest mesaj �i termin�\n"
 "  -v, --version       afi�eaz� informa�ii versiune �i termin�\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "Raporta�i bug-uri la >%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hello, world\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hello, world!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Memorie virtual� plin�\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, programul de tip�rire al saluturilor\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/ru.po b/po/ru.po
line changes: +46/-43
index 7f63a4e..e7317a2
--- a/po/ru.po
+++ b/po/ru.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-06-24 13:21+0400\n"
 "Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"

@@ -14,31 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "������� ����� ����������\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "���������� `%s --help' ��� ��������� ����� ���������� ��������.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, �� ����� ���������, ���������� �����������.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "����������, ���\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+------------------+\n"
+"| ����������, ���! |\n"
+"+------------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "����������, ���!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "�������������: %s [����]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -46,9 +72,9 @@ msgstr ""
 "  -h, --help          �������� ��� ������� � �����\n"
 "  -v, --version       �������� ���������� � ������ � �����\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -61,15 +87,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "�� ������� ��������� �� ������ <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -78,32 +104,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "����������, ���\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+------------------+\n"
-"| ����������, ���! |\n"
-"+------------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "����������, ���!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -201,6 +201,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: ����������� ������ ���������\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, �� ����� ���������, ���������� �����������.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/sk.po b/po/sk.po
line changes: +46/-43
index e1bac10..03946f8
--- a/po/sk.po
+++ b/po/sk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-06-11 10:32+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

@@ -16,31 +16,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Pr�li� ve�a argumentov\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Sk�ste `%s --help' pre viac inform�ci�.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, TEN program vypisuj�ci pozdrav.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "ahoj, svet\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-------------+\n"
+"| Ahoj, svet! |\n"
+"+-------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Ahoj, svet!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Pou�itie: %s [VO�BA]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 "  -h, --help          zobrazi� t�to pomoc a skon�i�\n"
 "  -v, --version       zobrazi� inform�cie o verzii a skon�i�\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,10 +89,10 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""

@@ -74,7 +100,7 @@ msgstr ""
 "Koment�re k slovensk�mu prekladu zasielajte na adresu <sk-i18n@lists.linux."
 "sk>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -83,32 +109,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "ahoj, svet\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-------------+\n"
-"| Ahoj, svet! |\n"
-"+-------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Ahoj, svet!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -206,6 +206,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Bola vy�erpan� virtu�lna pam�\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, TEN program vypisuj�ci pozdrav.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/sl.po b/po/sl.po
line changes: +48/-45
index b426f15..4acb4d6
--- a/po/sl.po
+++ b/po/sl.po

@@ -2,13 +2,13 @@
 # Copyright (C) 1996 Free Software Foundation, Inc.
 # Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 2005.
 #
-# $Id: sl.po,v 1.7 2006/10/16 00:05:27 karl Exp $
+# $Id: sl.po,v 1.8 2006/10/18 22:41:24 karl Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2005-08-31 12:06+0200\n"
 "Last-Translator: Primoz Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"

@@ -16,31 +16,58 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Preveč argumentov\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello: program, ki vas pozdravi.\n"
+#  Ima to smisel prevajati? :-)
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "zdravo, svet\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Zdravo, svet! |\n"
+"+---------------+\n"
+
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Zdravo, svet!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [IZBIRA]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +75,9 @@ msgstr ""
 "  -h, --help          ta navodila\n"
 "  -v, --version       verzija programa\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,17 +90,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Poročila o napakah javite na <%s>, poročila o napakah v slovenskem prevodu\n"
 "uporabniškega vmesnika na <primoz.peterlin@biofiz.mf.uni-lj.si>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -82,33 +109,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#  Ima to smisel prevajati? :-)
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "zdravo, svet\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Zdravo, svet! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Zdravo, svet!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -207,6 +207,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: zmanjkalo virtualnega pomnilnika\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello: program, ki vas pozdravi.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/sr.po b/po/sr.po
line changes: +46/-43
index e204a65..85c130e
--- a/po/sr.po
+++ b/po/sr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-09-02 12:17-0400\n"
 "Last-Translator: Aleksandar Jelenak <jelenak@verizon.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"

@@ -16,31 +16,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Исувише аргумената\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за подробније објашњење.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "ГНУ hello, ЧУВЕНИ програм за исписивање поздрава.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "поздрав свима\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+----------------+\n"
+"| Поздрав свима! |\n"
+"+----------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Поздрав свима!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЈА]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 "  -h, --help          прикажи ово објашњење и заврши\n"
 "  -v, --version       прикажи верзију и заврши\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -62,17 +88,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Пријавите грешке на адресу <%s>.\n"
 "Поруке у вези превода шаљите на адресу <gnu@prevod.org>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -85,32 +111,6 @@ msgstr ""
 "Ово је слободни софтвер.  Без ИКАКВЕ ГАРАНЦИЈЕ, колико је законом "
 "дозвољено.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "поздрав свима\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+----------------+\n"
-"| Поздрав свима! |\n"
-"+----------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Поздрав свима!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"

@@ -206,3 +206,6 @@ msgstr "“"
 #: gnulib/lib/xalloc-die.c:37
 msgid "memory exhausted"
 msgstr "меморија исцрпљена"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "ГНУ hello, ЧУВЕНИ програм за исписивање поздрава.\n"

diff --git a/po/sv.po b/po/sv.po
line changes: +46/-43
index 51fea9f..cc5cebc
--- a/po/sv.po
+++ b/po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.37\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2002-02-01 22:39+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "F�r m�nga argument\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "F�rs�k med \"%s --help\" f�r mer information.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, PROGRAMMET f�r h�lsningsutskrifter.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "hej, v�rlden\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Hej, v�rlden! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Hej, v�rlden!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Anv�ndning: %s [FLAGGA]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          visa denna hj�lptext och avsluta\n"
 "  -v, --version       visa versionsinformation och avsluta\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,17 +88,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Rapportera fel till <%s>.\n"
 "Skicka anm�rkningar p� �vers�ttningen till <sv@li.org>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -81,32 +107,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "hej, v�rlden\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Hej, v�rlden! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Hej, v�rlden!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -204,6 +204,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: Virtuellt minne slut\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, PROGRAMMET f�r h�lsningsutskrifter.\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/tr.po b/po/tr.po
line changes: +51/-48
index 1aaca3e..777f471
--- a/po/tr.po
+++ b/po/tr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-08-28 16:59+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"

@@ -16,31 +16,62 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Çok fazla argüman\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello. Karşılama iletisi programı.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "merhaba, dünya\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"┌─────────────────┐\n"
+"│ Merhaba, dünya! │\n"
+"└─────────────────┘\n"
+"Not:\n"
+"Bu iletiyi çizgiler içinde göremiyorsanız bir de\n"
+"export LANG=\"tr_TR.UTF-8\"\n"
+"unicode_start\n"
+"ile deneyin.\n"
+
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Merhaba, dünya!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanımı: %s [SEÇENEK]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +79,9 @@ msgstr ""
 "  -h, --help              bu iletileri gösterir ve çıkar\n"
 "  -v, --version           sürümü gösterir ve çıkar\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -62,17 +93,17 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Lütfen, yazılım hatalarını <%s>,\n"
 "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -85,37 +116,6 @@ msgstr ""
 "Bu bir özgür yazılım olduğundan yasaların izin verdiği ölçüde\n"
 "herhangi bir garanti verilmemektedir.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "merhaba, dünya\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"┌─────────────────┐\n"
-"│ Merhaba, dünya! │\n"
-"└─────────────────┘\n"
-"Not:\n"
-"Bu iletiyi çizgiler içinde göremiyorsanız bir de\n"
-"export LANG=\"tr_TR.UTF-8\"\n"
-"unicode_start\n"
-"ile deneyin.\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Merhaba, dünya!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"

@@ -212,6 +212,9 @@ msgstr "'"
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello. Karşılama iletisi programı.\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"

diff --git a/po/uk.po b/po/uk.po
line changes: +46/-43
index 128d677..b7d1342
--- a/po/uk.po
+++ b/po/uk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2004-03-17 12:01+0200\n"
 "Last-Translator: Igor Sachko <kick@tcs.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"

@@ -16,31 +16,57 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "�������� �������Ԧ�\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������Φ�ϧ �������æ�.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, �������� ��� ����� צ�����.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "���צ�, �צ�\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| ���צ�, �צ�! |\n"
+"+---------------+\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "���צ� �צ�!"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "������������: %s [��������]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 "  -h, --help          �������� ������ �� �����\n"
 "  -v, --version       �������� ���Ӧ� �� �����\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -63,15 +89,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "��� ������� �צ����� �� <%s>.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -80,32 +106,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "���צ�, �צ�\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| ���צ�, �צ�! |\n"
-"+---------------+\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "���צ� �צ�!"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -203,6 +203,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: ���������� ���'��� ���������\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, �������� ��� ����� צ�����.\n"
+
 #~ msgid "%s: Incompatible flags: -m and -t\n"
 #~ msgstr "%s: ����ͦ�Φ ���������: -m �� -t\n"
 

diff --git a/po/vi.po b/po/vi.po
line changes: +48/-44
index 6dc2073..6faaa24
--- a/po/vi.po
+++ b/po/vi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.93\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2006-10-18 16:15+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"

@@ -16,31 +16,57 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "Quá nhiều đối số\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Thử lệnh « %s --help » để gọi thông tin thêm.\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, chương trình in lời chào mừng.\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "chào thế giới\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"┏━━━━━━━━━┓\n"
+"┃  Chào thế giới !    ┃\n"
+"┗━━━━━━━━━┛\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "Chào thế giới !"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Cách sử dụng: %s [TÙY CHỌN]...\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -48,9 +74,9 @@ msgstr ""
 " -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
 " -v --version         hiển thị thông tin _phiên bản_ rồi thoát\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -62,22 +88,23 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Thông báo lỗi cho <%s>.\n"
 "Thông báo lỗi dịch cho <vi-VN@googlegroups.com> nhé.\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "License: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
-"This is free software.  There is NO WARRANTY, to the extent permitted by law.\n"
+"This is free software.  There is NO WARRANTY, to the extent permitted by "
+"law.\n"
 msgstr ""
 "Tác quyền © năm %s Tổ Chực Phần Mềm Tự Do.\n"
 "Giấy Phép: Giấy Phép Công Cộng GNU (GPL) phiên bản 2+\n"

@@ -85,32 +112,6 @@ msgstr ""
 "Đây là phần mềm tự do. KHÔNG CÓ BẢO HÀNH NÀO CẢ,\n"
 "với điều kiện được pháp luật cho phép.\n"
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "chào thế giới\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"┏━━━━━━━━━┓\n"
-"┃  Chào thế giới !    ┃\n"
-"┗━━━━━━━━━┛\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "Chào thế giới !"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"

@@ -206,3 +207,6 @@ msgstr " »"
 #: gnulib/lib/xalloc-die.c:37
 msgid "memory exhausted"
 msgstr "hết bộ nhớ rồi"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, chương trình in lời chào mừng.\n"

diff --git a/po/zh_CN.po b/po/zh_CN.po
line changes: +52/-49
index 9f2f30a..c5e5c48
--- a/po/zh_CN.po
+++ b/po/zh_CN.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2004-03-04 19:15+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"

@@ -15,37 +15,65 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "����̫��\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "���ԡ�%s --help���Ի�ø�����Ϣ��\n"
 
-#  TRANSLATORS: --help output 1
-#  no-wrap
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello����ӡ�ʺ���ij���\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "�������\n"
+
+#  TRANSLATORS: Use box drawing characters or other fancy stuff
+#  if your encoding (e.g., UTF-8) allows it.  If done so add the
+#  following note, please:
+#  [Note: For best viewing results use a UTF-8 locale, please.]
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"��������������\n"
+"����������\n"
+"��������������\n"
+
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "������ã�"
 
 #  TRANSLATORS: --help output 2
 #  no-wrap
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "�÷���%s [ѡ��]\n"
 
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
 #  TRANSLATORS: --help output 3 : options 1/2
 #  no-wrap
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -55,9 +83,9 @@ msgstr ""
 
 #  TRANSLATORS: --help output 4 : options 2/2
 #  no-wrap
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -74,15 +102,15 @@ msgstr ""
 #  no-wrap
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "��<%s>�������ȱ�ݡ�\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -91,36 +119,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "�������\n"
-
-#  TRANSLATORS: Use box drawing characters or other fancy stuff
-#  if your encoding (e.g., UTF-8) allows it.  If done so add the
-#  following note, please:
-#  [Note: For best viewing results use a UTF-8 locale, please.]
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"��������������\n"
-"����������\n"
-"��������������\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "������ã�"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -218,6 +216,11 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s�������ڴ��Ѻľ�\n"
 
+#  TRANSLATORS: --help output 1
+#  no-wrap
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello����ӡ�ʺ���ij���\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/po/zh_TW.po b/po/zh_TW.po
line changes: +46/-43
index 183ee2c..803ece5
--- a/po/zh_TW.po
+++ b/po/zh_TW.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2006-10-15 17:04-0700\n"
+"POT-Creation-Date: 2006-10-18 15:40-0700\n"
 "PO-Revision-Date: 2005-04-28 16:39+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"

@@ -15,31 +15,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/hello.c:84
+#: src/hello.c:88
 msgid "Too many arguments\n"
 msgstr "引數過多\n"
 
-#: src/hello.c:85
+#: src/hello.c:89
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "請嘗試執行‘%s --help’來獲取更多資訊。\n"
 
-#. TRANSLATORS: --help output 1
-#. no-wrap
-#: src/hello.c:99
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello，問候印出程式。\n"
+#: src/hello.c:96
+#, c-format
+msgid "hello, world\n"
+msgstr "哈囉，大家好\n"
+
+#. TRANSLATORS: Use box drawing characters or other fancy stuff
+#. if your encoding (e.g., UTF-8) allows it.  If done so add the
+#. following note, please:
+#.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
+#.
+#: src/hello.c:105
+#, c-format
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"┌───────┐\n"
+"│哈囉，大家好！│\n"
+"└───────┘\n"
 
-#. TRANSLATORS: --help output 2
+#: src/hello.c:114
+msgid "Hello, world!"
+msgstr "哈囉，大家好！"
+
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:104
+#: src/hello.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [選項]\n"
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:154
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:110
+#: src/hello.c:160
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -47,9 +73,9 @@ msgstr ""
 "  -h, --help          顯示此輔助訊息並離開\n"
 "  -v, --version       顯示版本資訊並離開\n"
 
-#. TRANSLATORS: --help output 4 : options 2/2
+#. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:117
+#: src/hello.c:167
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -62,15 +88,15 @@ msgstr ""
 
 #. TRANSLATORS: --help output 5 (end)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application. Please add _another line_ with the
+#. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:128
+#: src/hello.c:178
 #, c-format
 msgid "Report bugs to <%s>.\n"
 msgstr "請向 <%s> 回報錯誤。\n"
 
-#: src/hello.c:138
+#: src/hello.c:196
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -79,32 +105,6 @@ msgid ""
 "law.\n"
 msgstr ""
 
-#: src/hello.c:149
-#, c-format
-msgid "hello, world\n"
-msgstr "哈囉，大家好\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:157
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"┌───────┐\n"
-"│哈囉，大家好！│\n"
-"└───────┘\n"
-
-#: src/hello.c:165
-msgid "Hello, world!"
-msgstr "哈囉，大家好！"
-
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr ""

@@ -202,6 +202,9 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "%s: 虛擬記憶體已耗盡\n"
 
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello，問候印出程式。\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"