diff --git a/po/fr.po b/po/fr.po
line changes: +205/-127
index e3b2ebb..186f734
--- a/po/fr.po
+++ b/po/fr.po

@@ -5,95 +5,69 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
-"POT-Creation-Date: 2002-02-02 17:03+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2004-05-10 08:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option � %s � est ambigu�.\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option � --%s � ne permet pas un autre param�tre.\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option � %c%s � ne permet pas un autre param�tre.\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option � %s � requiert un param�tre.\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: l'option � --%s � n'est pas reconnue.\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: l'option � %c%s � n'est pas reconnue.\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: l'option -- %c est ill�gale.\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: l'option -- %c est invalide.\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:831 src/getopt.c:961
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option -- %c requiert un param�tre.\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pour plus d'informations, faire: � %s --help �.\n"
 
-#: src/getopt.c:878
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option � -W %s � est ambigu�.\n"
+msgid "hello, world\n"
+msgstr "Bonjour, le monde.\n"
 
-#: src/getopt.c:896
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option � -W %s � ne permet pas un autre param�tre.\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "Trop de param�tres.\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------------+\n"
+"| Bonjour, le monde! |\n"
+"+--------------------+\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pour plus d'informations, faire: � %s --help �.\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "Bonjour, le monde!"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, LE programme de salutations et de bienvenue.\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Usage: %s [OPTION]\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "Usage: %s [OPTION]\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -101,91 +75,193 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       utiliser le format traditionnel de salutations\n"
-"  -n, --next-generation   utiliser le format de nouvelle g�n�ration pour les salutations\n"
+"  -n, --next-generation   utiliser le format de nouvelle g�n�ration pour les "
+"salutations\n"
 "  -m, --mail              lire votre courrier\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
 msgstr "Rapporter toutes anomalies � <%s>.\n"
 
-#: src/hello.c:217
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Rapporter toutes anomalies � <%s>.\n"
+
+#: src/hello.c:184
 #, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+msgid "%s home page: <%s>\n"
 msgstr ""
-"Copyright � %s Free Software Foundation, Inc.\n"
-"AUCUNE garantie n'est donn�e; tant pour des raisons COMMERCIALES que\n"
-"pour R�PONDRE � UN BESOIN PARTICULIER.  Vous pouvez redistribuer des copies\n"
-"du progiciel %s de GNU selon les termes de la licence\n"
-"GNU General Public License.\n"
-"Pour plus d'informations, consulter le fichier COPYING.\n"
-
-#: src/hello.c:228
-#, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: options incompatibles: -m et -t\n"
 
-#: src/hello.c:260
+#: src/hello.c:186
 #, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: Qui �tes-vous?\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: ne peut rep�rer votre fichier de bo�te aux lettres.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "Aucune activit� ne s'est produite."
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "Bonjour, le monde.\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: l'option � %s � est ambigu�.\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: l'option � --%s � ne permet pas un autre param�tre.\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: l'option � %c%s � ne permet pas un autre param�tre.\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: l'option � %s � requiert un param�tre.\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: l'option � --%s � n'est pas reconnue.\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: l'option � %c%s � n'est pas reconnue.\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: l'option -- %c est invalide.\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: l'option -- %c requiert un param�tre.\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: l'option � -W %s � est ambigu�.\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: l'option � -W %s � ne permet pas un autre param�tre.\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l'option � %s � requiert un param�tre.\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"+--------------------+\n"
-"| Bonjour, le monde! |\n"
-"+--------------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "Bonjour, le monde!"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: m�moire virtuelle �puis�e\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: l'option -- %c est ill�gale.\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "Trop de param�tres.\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, LE programme de salutations et de bienvenue.\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright � %s Free Software Foundation, Inc.\n"
+#~ "AUCUNE garantie n'est donn�e; tant pour des raisons COMMERCIALES que\n"
+#~ "pour R�PONDRE � UN BESOIN PARTICULIER.  Vous pouvez redistribuer des "
+#~ "copies\n"
+#~ "du progiciel %s de GNU selon les termes de la licence\n"
+#~ "GNU General Public License.\n"
+#~ "Pour plus d'informations, consulter le fichier COPYING.\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: options incompatibles: -m et -t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: Qui �tes-vous?\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: ne peut rep�rer votre fichier de bo�te aux lettres.\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "Aucune activit� ne s'est produite."
+
 #~ msgid ""
 #~ "GNU hello, THE greeting printing program.\n"
 #~ "\n"

@@ -210,8 +286,10 @@ msgstr "%s: m
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright � %s Free Software Foundation, Inc.\n"
 #~ "Ce logiciel est libre; voir les sources pour les conditions de\n"

diff --git a/po/ga.po b/po/ga.po
line changes: +95/-70
index 576dc4d..194853b
--- a/po/ga.po
+++ b/po/ga.po

@@ -7,25 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.3\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2007-06-26 15:18-0700\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2007-07-04 15:48-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:95
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: oibreann breise: %s\n"
 
-#: src/hello.c:97
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n"
 
-#: src/hello.c:104
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "Dia duit, a dhomhain\n"

@@ -36,7 +37,7 @@ msgstr "Dia duit, a dhomhain\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:113
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -47,26 +48,26 @@ msgstr ""
 "| Dia duit, a dhomhain! |\n"
 "+-----------------------+\n"
 
-#: src/hello.c:122
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:140
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Úsáid: %s [ROGHA]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:145
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Priontáil beannacht chairdiúil in-saincheaptha.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:151
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -76,7 +77,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:158
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -86,125 +87,149 @@ msgstr ""
 "  -n, --next-generation   bain úsáid as beannacht nua-aoiseach\n"
 "  -g, --greeting=TCHT     úsáid TCHT mar an bheannacht\n"
 
-#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: --help output 5+ (reports)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:169
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
+msgstr "Seol tuairiscí fabhtanna chuig <%s>.\n"
+
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr "Seol tuairiscí fabhtanna chuig <%s>.\n"
 
-#: src/hello.c:187
+#: src/hello.c:184
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr ""
+
+#: src/hello.c:186
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright © %s Free Software Foundation, Inc.\n"
-"Ceadúnas: GNU GPLv3+ GNU GPL, leagan 3 nó níos nuaí <http://gnu.org/licenses/gpl.html>\n"
+"Ceadúnas: GNU GPLv3+ GNU GPL, leagan 3 nó níos nuaí <http://gnu.org/licenses/"
+"gpl.html>\n"
 "Is saorbhogearra é seo: ceadaítear duit é a athrú agus a athdháileadh.\n"
 "Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n"
 
-#: gnulib/lib/error.c:125
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "Earráid anaithnid chórais"
 
-#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: Tá an rogha `%s' débhríoch\n"
 
-#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n"
 
-#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n"
 
-#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
-#: gnulib/lib/getopt.c:995
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 
-#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: rogha anaithnid `--%s'\n"
 
-#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: rogha neamhcheadaithe -- %c\n"
-
-#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: rogha neamhbhailí -- %c\n"
 
-#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
-#: gnulib/lib/getopt.c:1066
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- %c\n"
 
-#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Tá an rogha `-W %s' débhríoch\n"
 
-#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n"
 
-#: gnulib/lib/closeout.c:74
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "earráid sa scríobh"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:229
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:230
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "'"
 
-#: gnulib/lib/xalloc-die.c:35
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "cuimhne ídithe"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
+
 #~ msgid "Too many arguments\n"
 #~ msgstr "An iomarca argóintí\n"
 

diff --git a/po/gl.po b/po/gl.po
line changes: +199/-122
index b123541..29c0756
--- a/po/gl.po
+++ b/po/gl.po

@@ -5,94 +5,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"POT-Creation-Date: 2002-02-02 17:03+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: a opci�n `%s' � ambigua\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: a opci�n `--%s' non admite un argumento\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: a opci�n `%c%s' non admite un argumento\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: a opci�n `%s' precisa dun argumento\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opci�n `--%s' non reco�ecida\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opci�n `%c%s' non reco�ecida\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opci�n non v�lida -- %c\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opci�n non v�lida -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:831 src/getopt.c:961
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: a opci�n precisa dun argumento -- %c\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Escriba `%s --help' para obter m�is informaci�n.\n"
 
-#: src/getopt.c:878
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: a opci�n `-W %s' � ambigua\n"
+msgid "hello, world\n"
+msgstr "ola, mundo\n"
 
-#: src/getopt.c:896
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: a opci�n `-W %s' non admite un argumento\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "Demasiados argumentos\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------+\n"
+"| �Ola, mundo! |\n"
+"+--------------+\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Escriba `%s --help' para obter m�is informaci�n.\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "�Ola, mundo!"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, *O* programa que amosa sa�dos.\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Emprego: %s [OPCI�N]\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "Emprego: %s [OPCI�N]\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -100,88 +74,191 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       emprega-lo formato de sa�do tradicional\n"
 "  -n, --next-generation   emprega-lo formato de sa�do da nova xeraci�n\n"
 "  -m, --mail              amosa-lo correo\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, 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:217
-#, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Non hai NINGUNHA garant�a; nin sequera a de COMERCIABILIDADE ou\n"
-"APTITUDE PARA UN FIN DETERMINADO. Pode redistribu�r copias de GNU %s\n"
-"baixo os termos da Licencia P�blica Xeral de GNU.\n"
-"Para obter m�is informaci�n sobre estes temas, vexa o ficheiro chamado COPYING.\n"
+"Informe dos erros no programa a <%s>.\n"
+"Informe dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: src/hello.c:228
+#: src/hello.c:184
 #, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: Modificadores incompatibles: -m e -t\n"
+msgid "%s home page: <%s>\n"
+msgstr ""
 
-#: src/hello.c:260
+#: src/hello.c:186
 #, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: �Quen � vostede?\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: Non se puido atopa-lo ficheiro co correo.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "Aqu� non pasa nada."
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "ola, mundo\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: a opci�n `%s' � ambigua\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n `--%s' non admite un argumento\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n `%c%s' non admite un argumento\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: a opci�n `%s' precisa dun argumento\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: opci�n `--%s' non reco�ecida\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: opci�n `%c%s' non reco�ecida\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opci�n non v�lida -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: a opci�n precisa dun argumento -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: a opci�n `-W %s' � ambigua\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: a opci�n `-W %s' non admite un argumento\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a opci�n `%s' precisa dun argumento\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"+--------------+\n"
-"| �Ola, mundo! |\n"
-"+--------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "�Ola, mundo!"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: Memoria virtual esgotada\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opci�n non v�lida -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "Demasiados argumentos\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, *O* programa que amosa sa�dos.\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Non hai NINGUNHA garant�a; nin sequera a de COMERCIABILIDADE ou\n"
+#~ "APTITUDE PARA UN FIN DETERMINADO. Pode redistribu�r copias de GNU %s\n"
+#~ "baixo os termos da Licencia P�blica Xeral de GNU.\n"
+#~ "Para obter m�is informaci�n sobre estes temas, vexa o ficheiro chamado "
+#~ "COPYING.\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: Modificadores incompatibles: -m e -t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: �Quen � vostede?\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: Non se puido atopa-lo ficheiro co correo.\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "Aqu� non pasa nada."

diff --git a/po/he.po b/po/he.po
line changes: +196/-122
index 181e697..4a63bd5
--- a/po/he.po
+++ b/po/he.po

@@ -5,94 +5,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"POT-Creation-Date: 2002-02-02 17:03+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s ����� ���� �����-�� ���� `%s' ������\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s ����� ���� ������� ���� ���� `--%s' ������\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s ����� ���� ������� ���� ���� `%c%s' ������\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s ����� ���� ������� ����� `%s' ������\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s ����� ���� `--%s' �����-���� ������\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s ����� ���� `%c%s' �����-���� ������\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ����-���� ������ -- %c\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s ����� ���� ���� ������ -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:831 src/getopt.c:961
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ������� ����� ������ -- %c\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr ".���� �� ���� ����� `%s --help' ����� ���\n"
 
-#: src/getopt.c:878
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s ����� ���� �����-�� ���� `-W %s' ������\n"
+msgid "hello, world\n"
+msgstr "!����� ��� ����\n"
 
-#: src/getopt.c:896
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s ����� ���� ������� ���� ���� `-W %s' ������\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "��������� ��� ����\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-----------------+\n"
+"| !����� ��� ���� |\n"
+"+-----------------+\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ".���� �� ���� ����� `%s --help' ����� ���\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "!����� ��� ����"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr ".���� ������ �������� �� ,GNU hello\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "%s [��������]  :����� ����\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "%s [��������]  :����� ����\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -100,86 +74,186 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "                     .������ ������ ���� ���       -t, --traditional\n"
 "                   .��� ���� ������ ���� ���       -n, --next-generation\n"
 "                  .��� ��������� ���� �� ���       -m, --mail\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
+msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
+
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
 
-#: src/hello.c:217
+#: src/hello.c:184
 #, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+msgid "%s home page: <%s>\n"
 msgstr ""
-"          Copyright (C) %s Free Software Foundation, Inc.\n"
-"  .������-������ �� ����� ;������ ������ ���� ����� ���� �� ������\n"
-"  �� GNU %s ����� ������ .������ ����� ����� ����� �� ������ ��\n"
-"                    .GNU General Public License ������ ����� �����\n"
-"                      .COPYING ����� ����� ,��� ������� ����� ����\n"
 
-#: src/hello.c:228
+#: src/hello.c:186
 #, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s ������ ���� -t ��� -m �� ����� ���� ��\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
 
-#: src/hello.c:260
-#, c-format
-msgid "%s: Who are you?\n"
-msgstr "?��� ��� ,%s\n"
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr ".��� ���� �� ���� �� ����� ����� ���� %s\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr ".��� ���� ���� ���"
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "!����� ��� ����\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s ����� ���� �����-�� ���� `%s' ������\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s ����� ���� ������� ���� ���� `--%s' ������\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s ����� ���� ������� ���� ���� `%c%s' ������\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s ����� ���� ������� ����� `%s' ������\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s ����� ���� `--%s' �����-���� ������\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s ����� ���� `%c%s' �����-���� ������\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s ����� ���� ���� ������ -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: ������� ����� ������ -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s ����� ���� �����-�� ���� `-W %s' ������\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s ����� ���� ������� ���� ���� `-W %s' ������\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s ����� ���� ������� ����� `%s' ������\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"+-----------------+\n"
-"| !����� ��� ���� |\n"
-"+-----------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "!����� ��� ����"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s ����� ���� �������� ������ ����\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ����-���� ������ -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "��������� ��� ����\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr ".���� ������ �������� �� ,GNU hello\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "          Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "  .������-������ �� ����� ;������ ������ ���� ����� ���� �� ������\n"
+#~ "  �� GNU %s ����� ������ .������ ����� ����� ����� �� ������ ��\n"
+#~ "                    .GNU General Public License ������ ����� �����\n"
+#~ "                      .COPYING ����� ����� ,��� ������� ����� ����\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s ������ ���� -t ��� -m �� ����� ���� ��\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "?��� ��� ,%s\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr ".��� ���� �� ���� �� ����� ����� ���� %s\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr ".��� ���� ���� ���"

diff --git a/po/hr.po b/po/hr.po
line changes: +203/-128
index daeed98..0c9774a
--- a/po/hr.po
+++ b/po/hr.po

@@ -9,94 +9,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"POT-Creation-Date: 2002-02-02 17:03+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcija `%s' nije jednozna�na\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcija `--%s' ne dozvoljava argument\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija `%c%s' ne dozvoljava argument\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ne prepoznajem opciju `--%s'\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ne prepoznajem opciju `%c%s'\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ilegalna opcija -- %c\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: pogre�na opcija -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:831 src/getopt.c:961
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcija zahtijeva neophodan argument -- %c\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Poku�aj `%s --help' za vi�e informacija.\n"
 
-#: src/getopt.c:878
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcija `-W %s' nije jednozna�na\n"
+msgid "hello, world\n"
+msgstr "pozdrav, svijete\n"
 
-#: src/getopt.c:896
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija `-W %s' ne dozvoljava argument\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "Prevelik broj argumenata\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+-------------------+\n"
+"| Pozdrav, svijete! |\n"
+"+-------------------+\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Poku�aj `%s --help' za vi�e informacija.\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "Pozdrav, svijete!"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, pozdravni program.\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Kori�tenje: %s [OPCIJA]\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "Kori�tenje: %s [OPCIJA]\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -104,91 +78,192 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       koristi tradicionalni pozdravni format\n"
 "  -n, --next-generation   koristi pozdravni format slijede�e generacije\n"
 "  -m, --mail              pogledaj svoj e-mail\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
 msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
 
-#: src/hello.c:217
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
+
+#: src/hello.c:184
 #, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+msgid "%s home page: <%s>\n"
 msgstr ""
-"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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
-"\n"
-"Ovaj program dolazi BEZ GARANCIJA; �ak niti za njegovu korisnost niti\n"
-"pogodnost za pojedine namjene. Mo�ete redistribuirati kopije programa\n"
-"pod uvjetima GNU Op�e Javne Licence.\n"
-"Za vi�e informacija o ovim stvarima, pogledajte datoteku COPYING\n"
-
-#: src/hello.c:228
-#, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: Nekompatibilne zastavice: -m i -t\n"
 
-#: src/hello.c:260
+#: src/hello.c:186
 #, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: Tko si ti?\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: Ne mogu prona�i tvoj po�tanski sandu�i� (mailbox).\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "Ni�ta se ne doga�a."
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "pozdrav, svijete\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: opcija `%s' nije jednozna�na\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: opcija `--%s' ne dozvoljava argument\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: opcija `%c%s' ne dozvoljava argument\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ne prepoznajem opciju `--%s'\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ne prepoznajem opciju `%c%s'\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: pogre�na opcija -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: opcija zahtijeva neophodan argument -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: opcija `-W %s' nije jednozna�na\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: opcija `-W %s' ne dozvoljava argument\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"+-------------------+\n"
-"| Pozdrav, svijete! |\n"
-"+-------------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: Iscrpljena virtualna memorija\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ilegalna opcija -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "Prevelik broj argumenata\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, pozdravni program.\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ "\n"
+#~ "Ovaj program dolazi BEZ GARANCIJA; �ak niti za njegovu korisnost niti\n"
+#~ "pogodnost za pojedine namjene. Mo�ete redistribuirati kopije programa\n"
+#~ "pod uvjetima GNU Op�e Javne Licence.\n"
+#~ "Za vi�e informacija o ovim stvarima, pogledajte datoteku COPYING\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: Nekompatibilne zastavice: -m i -t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: Tko si ti?\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: Ne mogu prona�i tvoj po�tanski sandu�i� (mailbox).\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "Ni�ta se ne doga�a."

diff --git a/po/hu.po b/po/hu.po
line changes: +58/-50
index 635826a..6d29168
--- a/po/hu.po
+++ b/po/hu.po

@@ -7,25 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.4.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2010-01-31 11:59-0800\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2010-10-19 16:37+0000\n"
 "Last-Translator: Emese Kovács <emese@instantweb.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: extra paraméter: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Próbáld a `%s --help'-et.\n"
 
-#: src/hello.c:109
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "Szia világ!\n"

@@ -36,7 +37,7 @@ msgstr "Szia világ!\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -47,26 +48,26 @@ msgstr ""
 "|  Szia világ!  |\n"
 "+---------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "Szia világ!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [KAPCSOLÓ]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Kedves, testreszabható üdvözletet ír ki.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -76,7 +77,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:168
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -91,7 +92,7 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:179
+#: src/hello.c:177
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""

@@ -99,127 +100,134 @@ msgstr ""
 "A fordítással kapcsolatos észrevételeket a \n"
 "<translation-team-hu@lists.sourceforge.net> címre várjuk.\n"
 
-#: src/hello.c:182
+#: src/hello.c:180
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "A program %s hibáit a következő címen jelentheted: <%s>.\n"
 
-#: src/hello.c:186
+#: src/hello.c:184
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s weblap: <%s>\n"
 
-#: src/hello.c:188
+#: src/hello.c:186
 #, c-format
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s weblap: <http://www.gnu.org/software/%s/>\n"
 
-#: src/hello.c:191
+#: src/hello.c:189
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
 msgstr ""
 "Általános segítség a GNU programokkal kapcsolatban:\n"
 "<http://www.gnu.org/gethelp/>\n"
 
-#: src/hello.c:209
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"GPLv3+ licenc: GNU GPL3 vagy későbbi változat <http://gnu.org/licenses/gpl.html>\n"
+"GPLv3+ licenc: GNU GPL3 vagy későbbi változat <http://gnu.org/licenses/gpl."
+"html>\n"
 "Ez szabad szoftver: nyugodtan módosítsd és add tovább.\n"
 "NINCS GARANCIA, már amennyire ezt a törvény engedi.\n"
 
-#: gnulib/lib/error.c:153
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
-#: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: '%s' kapcsoló nem egyértelmű\n"
 
-#: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582
+#: lib/getopt.c:624 lib/getopt.c:628
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a '--%s' kapcsoló nem fogad el argumentumot\n"
 
-#: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596
+#: lib/getopt.c:637 lib/getopt.c:642
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a '%c%s' kapcsoló nem fogad el argumentumot\n"
 
-#: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961
-#: gnulib/lib/getopt.c:980
-#, c-format
-msgid "%s: option '%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a '%s' kapcsoló argumentumot igényel\n"
 
-#: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699
+#: lib/getopt.c:742 lib/getopt.c:745
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ismeretlen kapcsoló: '--%s'\n"
 
-#: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710
+#: lib/getopt.c:753 lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ismeretlen kapcsoló: '%c%s'\n"
 
-#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen kapcsoló -- '%c'\n"
 
-#: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032
-#: gnulib/lib/getopt.c:1050
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a kapcsoló argumentumot igényel -- '%c'\n"
 
-#: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898
+#: lib/getopt.c:934 lib/getopt.c:950
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a '-W %s' kapcsoló nem egyértelmű\n"
 
-#: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940
+#: lib/getopt.c:974 lib/getopt.c:992
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a '-W %s' kapcsoló nem fogad el argumentumot\n"
 
-#: gnulib/lib/closeout.c:112
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a '%s' kapcsoló argumentumot igényel\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "iráshiba"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
-#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:272
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "U+201E"
 
-#: gnulib/lib/quotearg.c:273
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "U+201d"
 
-#: gnulib/lib/xalloc-die.c:34
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "memória elfogyott"

diff --git a/po/id.po b/po/id.po
line changes: +62/-52
index edd34bd..6aaff1f
--- a/po/id.po
+++ b/po/id.po

@@ -10,25 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.4.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2010-01-31 11:59-0800\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2010-02-01 17:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: kelebihan operand: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#: src/hello.c:109
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "halo, dunia\n"

@@ -39,7 +40,7 @@ msgstr "halo, dunia\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -50,26 +51,26 @@ msgstr ""
 "| Halo, dunia!  |\n"
 "+---------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "Halo, dunia!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Pemakaian: %s [PILIHAN]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Tampilkan sebuah salam yang bersahabat dan dapat diubah ubah.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -79,7 +80,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:168
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -94,131 +95,140 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:179
+#: src/hello.c:177
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Laporkan bug ke: %s\n"
 
-#: src/hello.c:182
+#: src/hello.c:180
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "Laporkan %s bug ke: %s\n"
 
-#: src/hello.c:186
+#: src/hello.c:184
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s halaman rumah: <%s>\n"
 
-#: src/hello.c:188
+#: src/hello.c:186
 #, c-format
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s halaman rumah: <http://www.gnu.org/software/%s/>\n"
 
-#: src/hello.c:191
+#: src/hello.c:189
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr "Batuan umum menggunakan perangkat lunak GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+"Batuan umum menggunakan perangkat lunak GNU: <http://www.gnu.org/gethelp/>\n"
 
-#: src/hello.c:209
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Hak Cipta (C) %s Free Software Foundation, Inc.\n"
-"Lisensi GPLv3+: GNU GPL versi 3 atau selanjutnya <http://www.gnu.org/licenses/gpl.html>\n"
-"Ini adalah piranti lunak bebas.  Anda bebas untuk mengubah dan meredistribusikannya.\n"
+"Lisensi GPLv3+: GNU GPL versi 3 atau selanjutnya <http://www.gnu.org/"
+"licenses/gpl.html>\n"
+"Ini adalah piranti lunak bebas.  Anda bebas untuk mengubah dan "
+"meredistribusikannya.\n"
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
-#: gnulib/lib/error.c:153
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tidak dikenal"
 
-#: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582
+#: lib/getopt.c:624 lib/getopt.c:628
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '--%s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596
+#: lib/getopt.c:637 lib/getopt.c:642
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib/lib/getopt.c:639 gnulib/lib/getopt.c:658 gnulib/lib/getopt.c:961
-#: gnulib/lib/getopt.c:980
-#, c-format
-msgid "%s: option '%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n"
 
-#: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699
+#: lib/getopt.c:742 lib/getopt.c:745
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tidak dikenal '--%s'\n"
 
-#: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710
+#: lib/getopt.c:753 lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tidak dikenal '%c%s'\n"
 
-#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032
-#: gnulib/lib/getopt.c:1050
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898
+#: lib/getopt.c:934 lib/getopt.c:950
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' ambigu\n"
 
-#: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940
+#: lib/getopt.c:974 lib/getopt.c:992
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan '-W %s' tidak membolehkan ada argumen\n"
 
-#: gnulib/lib/closeout.c:112
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "kesalahan penulisan"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
-#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:272
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:273
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "'"
 
-#: gnulib/lib/xalloc-die.c:34
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "memori habis"
 

diff --git a/po/it.po b/po/it.po
line changes: +203/-111
index 953044b..e1fa490
--- a/po/it.po
+++ b/po/it.po

@@ -6,88 +6,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.37\n"
-"POT-Creation-Date: 2002-01-31 21:27+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'opzione `%s' � ambigua\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `--%s' non ammette un argomento\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `%c%s' non ammette un argomento\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'opzione `%s' richiede un argomento\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' opzione non riconosciuta\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' opzione non riconosciuta\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opzione illegale -- %c\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opzione non valida -- %c\n"
-
-#: src/getopt.c:831 src/getopt.c:961
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'opzione richiede un argomento -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:878
+#: src/hello.c:100
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'opzione `-W %s' � ambigua\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Usare `%s --help' per ulteriori informazioni.\n"
 
-#: src/getopt.c:896
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "Troppi argomenti\n"
+msgid "hello, world\n"
+msgstr "salve, mondo\n"
 
-#: src/hello.c:165
+#. 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:116
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Usare `%s --help' per ulteriori informazioni.\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+---------------+\n"
+"| Salve, mondo! |\n"
+"+---------------+\n"
 
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, IL programma che stampa i saluti.\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "Salve, mondo!"
 
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
+#. TRANSLATORS: --help output 1 (synopsis)
+#. no-wrap
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONI]\n"
 
-#: src/hello.c:188
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
+
+#. TRANSLATORS: --help output 3: options 1/2
+#. no-wrap
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -95,74 +75,186 @@ msgstr ""
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -v, --version       mostra informazioni sulla versione ed esce\n"
 
-#: src/hello.c:195
+#. TRANSLATORS: --help output 4: options 2/2
+#. no-wrap
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       usa il formato di saluto tradizionale\n"
 "  -n, --next-generation   usa il formato di saluto di nuova generazione\n"
 "  -m, --mail              mostra la tua posta\n"
 
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
 msgstr "Segnalare i bug a <%s>.\n"
 
-#: src/hello.c:217
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Segnalare i bug a <%s>.\n"
+
+#: src/hello.c:184
 #, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+msgid "%s home page: <%s>\n"
 msgstr ""
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"NON c'� garanzia; neppure per la COMMERCIABILIT� o l'ADATTAMENTO AD UN\n"
-"PARTICOLARE SCOPO. � possibile redistribuire copie di GNU %s nei\n"
-"termini della GNU General Public License.\n"
-"Per maggiori informazioni su queste cose, vedere il file COPYING.\n"
 
-#: src/hello.c:228
+#: src/hello.c:186
 #, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: Opzioni incompatibili: -m e -t\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
 
-#: src/hello.c:260
-#, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: Chi sei?\n"
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: Impossibile trovare il tuo file di spool della posta.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "Qui non succede niente."
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "salve, mondo\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: l'opzione `%s' � ambigua\n"
 
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `--%s' non ammette un argomento\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `%c%s' non ammette un argomento\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: l'opzione `%s' richiede un argomento\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: `--%s' opzione non riconosciuta\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: `%c%s' opzione non riconosciuta\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opzione non valida -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: l'opzione richiede un argomento -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: l'opzione `-W %s' � ambigua\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l'opzione `%s' richiede un argomento\n"
+
+#: lib/closeout.c:112
+msgid "write error"
 msgstr ""
-"+---------------+\n"
-"| Salve, mondo! |\n"
-"+---------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "Salve, mondo!"
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
+
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: Memoria virtuale esaurita\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illegale -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "Troppi argomenti\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, IL programma che stampa i saluti.\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "NON c'� garanzia; neppure per la COMMERCIABILIT� o l'ADATTAMENTO AD UN\n"
+#~ "PARTICOLARE SCOPO. � possibile redistribuire copie di GNU %s nei\n"
+#~ "termini della GNU General Public License.\n"
+#~ "Per maggiori informazioni su queste cose, vedere il file COPYING.\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: Opzioni incompatibili: -m e -t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: Chi sei?\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: Impossibile trovare il tuo file di spool della posta.\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "Qui non succede niente."

diff --git a/po/ja.po b/po/ja.po
line changes: +208/-128
index 23ab127..5e6c0ee
--- a/po/ja.po
+++ b/po/ja.po

@@ -6,94 +6,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
-"POT-Creation-Date: 2002-02-02 17:03+0100\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/getopt.c:691
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ���ץ���� `%s' ��ۣ��Ǥ�\n"
-
-#: src/getopt.c:716
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� `--%s' �ϰ���������դ��ޤ���\n"
-
-#: src/getopt.c:721
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� `%c%s' �ϰ���������դ��ޤ���\n"
-
-#: src/getopt.c:739 src/getopt.c:912
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
-
-#: src/getopt.c:768
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `--%s' �Ǥ�\n"
-
-#: src/getopt.c:772
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `%c%s' �Ǥ�\n"
-
-#: src/getopt.c:798
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: �����ʥ��ץ����Ǥ� -- %c\n"
-
-#: src/getopt.c:801
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ̵���ʥ��ץ����Ǥ� -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:831 src/getopt.c:961
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ���ץ����ϰ������׵ᤷ�ޤ� -- %c\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "`%s --help' �ǡ����ܺ٤ʾ����Ĵ�٤ƤߤƤ���������\n"
 
-#: src/getopt.c:878
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
+msgid "hello, world\n"
+msgstr "�����衢����ˤ���\n"
 
-#: src/getopt.c:896
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� `-W %s' �ϡ�����������դ��ޤ���\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "������¿�����ޤ�\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"������������������������\n"
+"�������衢����ˤ��ϡ���\n"
+"������������������������\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "`%s --help' �ǡ����ܺ٤ʾ����Ĵ�٤ƤߤƤ���������\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "�����衢����ˤ��ϡ�"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "*����*��������ɽ���ץ�����ࡢHello �� GNU �ǤǤ���\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "����ˡ: %s [���ץ����]\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "����ˡ: %s [���ץ����]\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -101,93 +75,199 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       ����Ū�ʤ������Ĥν񼰤�Ȥ��ޤ�\n"
 "  -n, --next-generation   ������Τ������Ĥν񼰤�Ȥ��ޤ�\n"
 "  -m, --mail              ���ʤ��ؤΥ᡼���ɽ�����ޤ�\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
 msgstr ""
 "�Х��򸫤Ĥ����� <%s> ����𤷤Ƥ���������\n"
 "���ܸ�θ����� <ja@li.org> ����𤷤Ƥ���������\n"
 
-#: src/hello.c:217
-#, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr ""
-"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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
-"\n"
-"-- �ʲ��ϻ������Ǥ���ˡŪ�ʻ���ˤĤ��ƤϾ�ε��Ҥˤ������äƤ���������\n"
-"���ڤ��ݾڤϤ���ޤ��󡣾�������������ŪŬ�����˴ؤ����ݾڤ��餢��ޤ���\n"
-"���ʤ��ϡ�GNU hello �� GNU General Public License �˴�Ť��ƺ����ۤǤ��ޤ���\n"
-"�����λ���ˤĤ��Ƥξܤ�������ϡ�COPYING �Ȥ����ե�����򸫤Ƥ���������\n"
-
-#: src/hello.c:228
+"�Х��򸫤Ĥ����� <%s> ����𤷤Ƥ���������\n"
+"���ܸ�θ����� <ja@li.org> ����𤷤Ƥ���������\n"
+
+#: src/hello.c:184
 #, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: ξΩ���ʤ��ե饰: -m��-t\n"
+msgid "%s home page: <%s>\n"
+msgstr ""
 
-#: src/hello.c:260
+#: src/hello.c:186
 #, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: ���������\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: ���ʤ��Υ᡼�롦���ס��롦�ե����뤬���Ĥ���ޤ���\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "�����Ǥϲ��ⵯ����ʤ���"
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "�����衢����ˤ���\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: ���ץ���� `%s' ��ۣ��Ǥ�\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: ���ץ���� `--%s' �ϰ���������դ��ޤ���\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: ���ץ���� `%c%s' �ϰ���������դ��ޤ���\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `--%s' �Ǥ�\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `%c%s' �Ǥ�\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ̵���ʥ��ץ����Ǥ� -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: ���ץ����ϰ������׵ᤷ�ޤ� -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: ���ץ���� `-W %s' �ϡ�����������դ��ޤ���\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"������������������������\n"
-"�������衢����ˤ��ϡ���\n"
-"������������������������\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "�����衢����ˤ��ϡ�"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: ���ۥ����Ȥ��̤����ޤ���\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: �����ʥ��ץ����Ǥ� -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "������¿�����ޤ�\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "*����*��������ɽ���ץ�����ࡢHello �� GNU �ǤǤ���\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ "\n"
+#~ "-- �ʲ��ϻ������Ǥ���ˡŪ�ʻ���ˤĤ��ƤϾ�ε��Ҥˤ������äƤ���������\n"
+#~ "���ڤ��ݾڤϤ���ޤ��󡣾�������������ŪŬ�����˴ؤ����ݾڤ��餢��ޤ�"
+#~ "��\n"
+#~ "���ʤ��ϡ�GNU hello �� GNU General Public License �˴�Ť��ƺ����ۤǤ���"
+#~ "����\n"
+#~ "�����λ���ˤĤ��Ƥξܤ�������ϡ�COPYING �Ȥ����ե�����򸫤Ƥ�����"
+#~ "����\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: ξΩ���ʤ��ե饰: -m��-t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: ���������\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: ���ʤ��Υ᡼�롦���ס��롦�ե����뤬���Ĥ���ޤ���\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "�����Ǥϲ��ⵯ����ʤ���"

diff --git a/po/ka.po b/po/ka.po
line changes: +91/-68
index 222b773..73a02a1
--- a/po/ka.po
+++ b/po/ka.po

@@ -6,25 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2007-07-26 10:13-0700\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:95
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr ""
 
-#: src/hello.c:97
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "აკრიბეთ `%s --help' დამატებითი ინფორმაციისთვის.\n"
 
-#: src/hello.c:104
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "სალამი მსოფლიოს!\n"

@@ -35,7 +36,7 @@ msgstr "სალამი მსოფლიოს!\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:113
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -46,26 +47,26 @@ msgstr ""
 "| სალამი მსოფლიოს! |\n"
 "+------------------+\n"
 
-#: src/hello.c:122
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "სალამი მსოფლიოს!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:140
+#: src/hello.c:148
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "გამოძახება: %s [პარამეტრი]\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:145
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr ""
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:151
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -75,7 +76,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:158
+#: src/hello.c:166
 #, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"

@@ -86,17 +87,36 @@ msgstr ""
 "  -n, --next-generation   მომავალი თაობის მისალმება\n"
 "  -m, --mail              თქვენი ფოსტის ჩვენება\n"
 
-#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: --help output 5+ (reports)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:169
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
+msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
+
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
 
-#: src/hello.c:187
+#: src/hello.c:184
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr ""
+
+#: src/hello.c:186
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -106,103 +126,106 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: gnulib/lib/error.c:126
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: `%s' პარამეტრი გაურკვეველია\n"
 
-#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
-#: gnulib/lib/getopt.c:995
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: საჭიროა `%s' პარამეტრისთვის მნიშვნელობის გადაცემა\n"
 
-#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: უცნობი პარამეტრი `--%s'\n"
 
-#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: უცნობი პარამეტრი `--%c%s'\n"
 
-#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: დაუშვებელი პარამეტრი -- %c\n"
-
-#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: არასწორი პარამეტრი -- %c\n"
 
-#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
-#: gnulib/lib/getopt.c:1066
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: საჭიროა %c პარამეტრისთვის მნიშვნელობის გადაცემა\n"
 
-#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' პარამეტრი გაურკვეველია\n"
 
-#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/closeout.c:74
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: საჭიროა `%s' პარამეტრისთვის მნიშვნელობის გადაცემა\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr ""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:229
+#: lib/quotearg.c:312
 msgid "`"
 msgstr ""
 
-#: gnulib/lib/quotearg.c:230
+#: lib/quotearg.c:313
 msgid "'"
 msgstr ""
 
-#: gnulib/lib/xalloc-die.c:35
+#: lib/xalloc-die.c:34
 #, fuzzy
 msgid "memory exhausted"
 msgstr "%s: ვირტუალური მეხსიერება ამოწურულია\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: დაუშვებელი პარამეტრი -- %c\n"
+
 #~ msgid "Too many arguments\n"
 #~ msgstr "ზედმეტი პარამეტრები\n"
 

diff --git a/po/ko.po b/po/ko.po
line changes: +95/-70
index 9b777a4..a30fd05
--- a/po/ko.po
+++ b/po/ko.po

@@ -11,25 +11,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.3.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2008-11-07 02:26+0100\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2009-01-13 11:45+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:95
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: 추가 오퍼렌드: %s\n"
 
-#: src/hello.c:97
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "더 많이 알아 보려면 `%s --help' 옵션을 사용하십시오.\n"
 
-#: src/hello.c:104
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "안녕, 여러분\n"

@@ -40,7 +41,7 @@ msgstr "안녕, 여러분\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:113
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -51,26 +52,26 @@ msgstr ""
 "│ 안녕, 여러분! │\n"
 "└───────────────┘\n"
 
-#: src/hello.c:122
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "안녕하세요, 여러분!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:140
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:145
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "반가운 인사말을 (인사말은 설정할 수 있음) 출력합니다.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:151
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -80,7 +81,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:158
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -90,121 +91,145 @@ msgstr ""
 "  -n, --next-generation   신세대 인사말 형식을 사용합니다\n"
 "  -g, --greeting=<텍스트> <텍스트>를 인사말로 사용합니다\n"
 
-#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: --help output 5+ (reports)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:169
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
+msgstr "버그는 %s 주소로 알려 주십시오.\n"
+
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr "버그는 %s 주소로 알려 주십시오.\n"
 
-#: src/hello.c:187
+#: src/hello.c:184
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr ""
+
+#: src/hello.c:186
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: gnulib/lib/error.c:125
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: `%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' 옵션은 인수가 필요 없습니다\n"
 
-#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' 옵션은 인수가 필요 없습니다\n"
 
-#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
-#: gnulib/lib/getopt.c:990
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
-#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: 잘못된 옵션 -- %c\n"
-
-#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 틀린 옵션 -- %c\n"
 
-#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
-#: gnulib/lib/getopt.c:1061
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 인수가 필요한 옵션입니다 -- %c\n"
 
-#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib/lib/closeout.c:112
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "쓰기 오류"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:266
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "“"
 
-#: gnulib/lib/quotearg.c:267
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "”"
 
-#: gnulib/lib/xalloc-die.c:34
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "메모리가 바닥남"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: 잘못된 옵션 -- %c\n"

diff --git a/po/lv.po b/po/lv.po
line changes: +64/-54
index 639cea9..d0457d6
--- a/po/lv.po
+++ b/po/lv.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.6.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2011-03-22 11:48-0700\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2011-03-31 19:18-0000\n"
 "Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"

@@ -16,20 +16,21 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: src/hello.c:100
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: papildus operands: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Mēģiniet \"%s --help\" papildus informācijai.\n"
 
-#: src/hello.c:109
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "sveika, pasaule\n"

@@ -40,7 +41,7 @@ msgstr "sveika, pasaule\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -51,26 +52,26 @@ msgstr ""
 "| Sveika, pasaule!    |\n"
 "+----------------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "Sveika, pasaule!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Lietošana: %s [OPCIJAS]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Drukāt draudzīgu, pielāgojamu sveicienu.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -80,7 +81,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:168
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -95,135 +96,140 @@ msgstr ""
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:179
+#: src/hello.c:177
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Ziņojiet par kļūdas uz: %s.\n"
 
-#: src/hello.c:182
+#: src/hello.c:180
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "Ziņojiet %s kļūdas uz: %s.\n"
 
-#: src/hello.c:186
+#: src/hello.c:184
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s mājas lapa: <%s>\n"
 
-#: src/hello.c:188
+#: src/hello.c:186
 #, c-format
 msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
 msgstr "%s mājas lapa: <http://www.gnu.org/software/%s/>\n"
 
-#: src/hello.c:191
+#: src/hello.c:189
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr "Vispārējā palīdzība lietojot GNU programmatūru: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+"Vispārējā palīdzība lietojot GNU programmatūru: <http://www.gnu.org/gethelp/"
+">\n"
 
-#: src/hello.c:209
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Autortiesības (C) %s Brīvās Programmatūras Fondam, Inc.\n"
-"Licence GPLv3+: GNU GPL versija 3 vai vēlāks <http://gnu.org/licenses/gpl.html>\n"
+"Licence GPLv3+: GNU GPL versija 3 vai vēlāks <http://gnu.org/licenses/gpl."
+"html>\n"
 "Šī ir brīva programmatūra: jūs varat brīvi mainīt un izplatīt to.\n"
 "BEZ JEBKĀDĀM GARANTIJĀM, līdz likumā noteiktajam apjomam.\n"
 
-#: gnulib/lib/error.c:181
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "Nezināma sistēmas kļūda"
 
-#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
-#, c-format
-msgid "%s: option '%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: opcija \"%s\" nav viennozīmīga\n"
 
-#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
+#: lib/getopt.c:624 lib/getopt.c:628
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opcija \"--%s\" neatļauj argumentu\n"
 
-#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
+#: lib/getopt.c:637 lib/getopt.c:642
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija \"%c%s\" neatļauj argumentu\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
+#: lib/getopt.c:685 lib/getopt.c:704
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcijai \"--%s\" nepieciešams arguments\n"
 
-#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
+#: lib/getopt.c:742 lib/getopt.c:745
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neatpazīta opcija \"--%s\"\n"
 
-#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
+#: lib/getopt.c:753 lib/getopt.c:756
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neatpazita opcija \"%c%s\"\n"
 
-#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nederiga opcija -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
-#: gnulib/lib/getopt.c:1053
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcijai nepieciešams arguments -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
+#: lib/getopt.c:934 lib/getopt.c:950
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcija \"-W %s\" nav viennozīmīga\n"
 
-#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
+#: lib/getopt.c:974 lib/getopt.c:992
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija \"-W %s\" nepieļauj argumentu\n"
 
-#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
+#: lib/getopt.c:1013 lib/getopt.c:1031
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcijai \"-W %s\" nepieciešams arguments\n"
 
-#: gnulib/lib/closeout.c:112
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "rakstīšanas kļūda"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
-#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:271
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "\""
 
-#: gnulib/lib/quotearg.c:272
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "\""
 
-#: gnulib/lib/xalloc-die.c:34
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "atmiņa izsmelta"
 

@@ -255,7 +261,8 @@ msgstr "atmiņa izsmelta"
 #~ 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 ""

@@ -279,10 +286,13 @@ msgstr "atmiņa izsmelta"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright © %s Free Software Foundation, Inc.\n"
-#~ "Šī prgrammatūra ir brīva; skatieties izplatīšanas noteikumus izejtekstos.\n"
+#~ "Šī prgrammatūra ir brīva; skatieties izplatīšanas noteikumus "
+#~ "izejtekstos.\n"
 #~ "Nekādu garantiju; ne pat KOMERCIZMANTOŠANAI vai DERĪGUMAM\n"
 #~ "JEBKURAM NOLŪKAM.\n"

diff --git a/po/ms.po b/po/ms.po
line changes: +95/-70
index 06dcabf..19a274c
--- a/po/ms.po
+++ b/po/ms.po

@@ -8,26 +8,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.3.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2008-11-07 02:26+0100\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\n"
 "PO-Revision-Date: 2009-07-16 15:26+0800\n"
 "Last-Translator: Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/hello.c:95
+#: src/hello.c:98
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: operan lebihan: %s\n"
 
-#: src/hello.c:97
+#: src/hello.c:100
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Cuba `%s --help' untuk lebih maklumat.\n"
 
-#: src/hello.c:104
+#: src/hello.c:107
 #, c-format
 msgid "hello, world\n"
 msgstr "Hello, Duniaku\n"

@@ -38,7 +39,7 @@ msgstr "Hello, Duniaku\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:113
+#: src/hello.c:116
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -49,26 +50,26 @@ msgstr ""
 "| Hello, Duniaku! |\n"
 "+---------------+\n"
 
-#: src/hello.c:122
+#: src/hello.c:126
 msgid "Hello, world!"
 msgstr "Hello, Duniaku!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:140
+#: src/hello.c:148
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Penggunaan: %s [PILIHAN]\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:145
+#: src/hello.c:153
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Cetak ucapselamat yang mesra dan mudah diubah. \n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:151
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -78,7 +79,7 @@ msgstr ""
 
 #. TRANSLATORS: --help output 4: options 2/2
 #. no-wrap
-#: src/hello.c:158
+#: src/hello.c:166
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"

@@ -88,121 +89,145 @@ msgstr ""
 "  -n, --next-generation  menggunakan format ucapan generasi akan datang\n"
 "  -g, --greeting=TEKS    guna TEKS untuk ucapselamat\n"
 
-#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS: --help output 5+ (reports)
 #. TRANSLATORS: the placeholder indicates the bug-reporting address
 #. for this application.  Please add _another line_ with the
 #. address for translation bugs.
 #. no-wrap
-#: src/hello.c:169
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
+msgstr "Laporkan pepijat kepada <%s>.\n"
+
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
 msgstr "Laporkan pepijat kepada <%s>.\n"
 
-#: src/hello.c:187
+#: src/hello.c:184
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr ""
+
+#: src/hello.c:186
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: src/hello.c:207
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
-"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Hakcipta (C) %s Free Software Foundation, Inc.\n"
-"Lesen GPLv3+: GNU GPL version 3 atau kemudiannya <http://gnu.org/licenses/gpl.html>\n"
+"Lesen GPLv3+: GNU GPL version 3 atau kemudiannya <http://gnu.org/licenses/"
+"gpl.html>\n"
 "Ini adalah perisian bebas, anda boleh mengedarnya.\n"
 "TIADA WARANTI dalam had yang dibenarkan oleh undang-undang.\n"
 
-#: gnulib/lib/error.c:125
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "Ralat sistem tidak diketahui"
 
-#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: pilihan `%s' adalah kabur\n"
 
-#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `--%s' tidak mengizinkan hujah\n"
 
-#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `%c %s' tidak mengizinkan hujah\n"
 
-#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971
-#: gnulib/lib/getopt.c:990
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan `%s' memerlukan hujah\n"
 
-#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tidak dapat dikenalpasti `--%s'\n"
 
-#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tidak dapat dikenalpasti `%c%s'\n"
 
-#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: pilihan adalah salah  -- %c\n"
-
-#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak sah -- %c\n"
 
-#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043
-#: gnulib/lib/getopt.c:1061
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan memerlukan hujah -- %c\n"
 
-#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan `-W %s' adalah kabur\n"
 
-#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n"
 
-#: gnulib/lib/closeout.c:112
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: pilihan `%s' memerlukan hujah\n"
+
+#: lib/closeout.c:112
 msgid "write error"
 msgstr "ralat tulis"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
-#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:266
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:267
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "'"
 
-#: gnulib/lib/xalloc-die.c:34
+#: lib/xalloc-die.c:34
 msgid "memory exhausted"
 msgstr "memoritelah kehabisan"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: pilihan adalah salah  -- %c\n"

diff --git a/po/nb.po b/po/nb.po
line changes: +200/-125
index bdbe6e7..7ba2c87
--- a/po/nb.po
+++ b/po/nb.po

@@ -6,94 +6,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
-"POT-Creation-Date: 2002-05-22 19:23+0200\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2012-04-19 00:36+0100\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"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/getopt.c:693
+#: src/hello.c:98
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagget �%s� er flertydig\n"
-
-#: src/getopt.c:718
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flagget �--%s� tar ikke argumenter\n"
-
-#: src/getopt.c:723
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget �%c%s� tar ikke argumenter\n"
-
-#: src/getopt.c:741 src/getopt.c:914
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagget �%s� beh�ver et argument\n"
-
-#: src/getopt.c:770
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent flagg �--%s�\n"
-
-#: src/getopt.c:774
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent flagg �%c%s�\n"
-
-#: src/getopt.c:800
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig flagg -- %c\n"
-
-#: src/getopt.c:803
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ulovlig flagg -- %c\n"
+msgid "%s: extra operand: %s\n"
+msgstr ""
 
-#: src/getopt.c:833 src/getopt.c:963
+#: src/hello.c:100
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagg beh�ver et argument -- %c\n"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pr�v med �%s --help� for mer informasjon.\n"
 
-#: src/getopt.c:880
+#: src/hello.c:107
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagg �-W %s� er flertydig\n"
+msgid "hello, world\n"
+msgstr "hei, verden\n"
 
-#: src/getopt.c:898
+#. 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:116
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flagg �-W %s� tar ikke argumenter\n"
-
-#: src/hello.c:164
-msgid "Too many arguments\n"
-msgstr "For mange argumenter\n"
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
+msgstr ""
+"+--------------+\n"
+"| Hei, verden! |\n"
+"+--------------+\n"
 
-#: src/hello.c:165
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pr�v med �%s --help� for mer informasjon.\n"
+#: src/hello.c:126
+msgid "Hello, world!"
+msgstr "Hei, verden!"
 
-#. TRANSLATORS: --help output 1
+#. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:177
-msgid "GNU hello, THE greeting printing program.\n"
-msgstr "GNU hello, Det utimate hilsningsskriveprogrammet.\n"
+#: src/hello.c:148
+#, fuzzy, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Bruk: %s [FLAGG]\n"
 
-#. TRANSLATORS: --help output 2
+#. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:182
-#, c-format
-msgid "Usage: %s [OPTION]\n"
-msgstr "Bruk: %s [FLAGG]\n"
+#: src/hello.c:153
+msgid "Print a friendly, customizable greeting.\n"
+msgstr ""
 
-#. TRANSLATORS: --help output 3 : options 1/2
+#. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:188
+#: src/hello.c:159
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -101,93 +75,194 @@ 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:195
+#: src/hello.c:166
+#, fuzzy
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -m, --mail              print your mail\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       bruk tradisjonelt hilsningsformat\n"
 "  -n, --next-generation   bruk neste-generasjons hilsningsformat\n"
 "  -m, --mail              vis mailen din\n"
 
-#. TRANSLATORS: --help output 5 (end)
-#. TRANSLATORS, please don't forget to add the contact address for
-#. your translation!
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
 #. no-wrap
-#: src/hello.c:205
-#, c-format
-msgid "Report bugs to <%s>.\n"
+#: src/hello.c:177
+#, fuzzy, c-format
+msgid "Report bugs to: %s\n"
 msgstr "Rapporter feil til <%s>.\n"
 
-#: src/hello.c:217
+#: src/hello.c:180
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Rapporter feil til <%s>.\n"
+
+#: src/hello.c:184
 #, c-format
-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"
-"of the GNU General Public License.\n"
-"For more information about these matters, see the file named COPYING.\n"
+msgid "%s home page: <%s>\n"
 msgstr ""
-"(F�lgende tekst er en oversettelse som *kun* gis p� en informativ basis.\n"
-"For alle juridiske tolkninger gjelder den engelske originalteksten.)\n"
-"\n"
-"Copyright (C) %s Free Software Foundation, Inc.\n"
-"Det er INGEN FORM FOR garanti; ikke engang for SALGBARHET eller EGNETHET\n"
-"FOR NOEN SPESIELL ANVENDELSE.  Du kan redistribuere kopier av GNU %s under\n"
-"vilk�rene gitt i GNU General Public License.\n"
-"For mer infomrasjon om dette, se filen kalt COPYING.\n"
 
-#: src/hello.c:228
+#: src/hello.c:186
 #, c-format
-msgid "%s: Incompatible flags: -m and -t\n"
-msgstr "%s: Ukompatible flagg: -m og -t\n"
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
 
-#: src/hello.c:260
-#, c-format
-msgid "%s: Who are you?\n"
-msgstr "%s: Hvem er du?\n"
+#: src/hello.c:189
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
 
-#: src/hello.c:282
+#: src/hello.c:207
 #, c-format
-msgid "%s: Cannot find your mail spool file.\n"
-msgstr "%s: Kan ikke finne mail-filen din.\n"
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
+"html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
 
-#: src/hello.c:326
-msgid "Nothing happens here."
-msgstr "Her skjer ingen ting."
+#: lib/error.c:188
+msgid "Unknown system error"
+msgstr ""
 
-#: src/hello.c:332
-msgid "hello, world\n"
-msgstr "hei, verden\n"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: flagget �%s� er flertydig\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:
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: flagget �--%s� tar ikke argumenter\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget �%c%s� tar ikke argumenter\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: flagget �%s� beh�ver et argument\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ukjent flagg �--%s�\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ukjent flagg �%c%s�\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ulovlig flagg -- %c\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: flagg beh�ver et argument -- %c\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: flagg �-W %s� er flertydig\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: flagg �-W %s� tar ikke argumenter\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flagget �%s� beh�ver et argument\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr ""
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
 #.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
 #.
-#: src/hello.c:340
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
 msgstr ""
-"+--------------+\n"
-"| Hei, verden! |\n"
-"+--------------+\n"
 
-#: src/hello.c:346
-msgid "Hello, world!"
-msgstr "Hei, verden!"
+#: lib/quotearg.c:313
+msgid "'"
+msgstr ""
 
-#: src/hello.c:361
-#, c-format
-msgid "%s: Virtual memory exhausted\n"
+#: lib/xalloc-die.c:34
+#, fuzzy
+msgid "memory exhausted"
 msgstr "%s: Virtuelt minne oppbrukt\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovlig flagg -- %c\n"
+
+#~ msgid "Too many arguments\n"
+#~ msgstr "For mange argumenter\n"
+
+#~ msgid "GNU hello, THE greeting printing program.\n"
+#~ msgstr "GNU hello, Det utimate hilsningsskriveprogrammet.\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"
+#~ "of the GNU General Public License.\n"
+#~ "For more information about these matters, see the file named COPYING.\n"
+#~ msgstr ""
+#~ "(F�lgende tekst er en oversettelse som *kun* gis p� en informativ basis.\n"
+#~ "For alle juridiske tolkninger gjelder den engelske originalteksten.)\n"
+#~ "\n"
+#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
+#~ "Det er INGEN FORM FOR garanti; ikke engang for SALGBARHET eller EGNETHET\n"
+#~ "FOR NOEN SPESIELL ANVENDELSE.  Du kan redistribuere kopier av GNU %s "
+#~ "under\n"
+#~ "vilk�rene gitt i GNU General Public License.\n"
+#~ "For mer infomrasjon om dette, se filen kalt COPYING.\n"
+
+#~ msgid "%s: Incompatible flags: -m and -t\n"
+#~ msgstr "%s: Ukompatible flagg: -m og -t\n"
+
+#~ msgid "%s: Who are you?\n"
+#~ msgstr "%s: Hvem er du?\n"
+
+#~ msgid "%s: Cannot find your mail spool file.\n"
+#~ msgstr "%s: Kan ikke finne mail-filen din.\n"
+
+#~ msgid "Nothing happens here."
+#~ msgstr "Her skjer ingen ting."
+
 #~ msgid ""
 #~ "This is GNU Hello, THE greeting printing program.\n"
 #~ "Usage: %s [OPTION]\n"