Project Info Name.......: gnu-hello
Description: GNU Hello


gnu-hello       
Info
Commit...:f3e30062be4b39ff824a76e9a004b44c5a975199
Author...:Reuben Thomas
Committer:Reuben Thomas
Date.....:Wed Apr 18 19:47:41 2012 +0100
Parents..:dc89c6268881052ddb739d2e7608fc77d6b20049

Message 
Update gettext.

Changes 
diff --git a/po/LINGUAS b/po/LINGUAS
line changes: +0/-11
index 1190e40..eb9d86e
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,18 +1,8 @@
-# Set of available languages.
-#
-#  Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-#  2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-#
-#  Copying and distribution of this file, with or without modification,
-#  are permitted in any medium without royalty provided the copyright
-#  notice and this notice are preserved.
 bg
 ca
 da
 de
 el
-en@boldquot
-en@quot
 eo
 es
 et

@@ -38,7 +28,6 @@ nn
 pl
 pt
 pt_BR
-rm
 ro
 ru
 sk


diff --git a/po/Makefile.in.in b/po/Makefile.in.in
line changes: +5/-3
index 83d8838..2a71983
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@
 	mv t-$@ $@
 
 
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
-	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }

@@ -123,6 +123,7 @@ check-macro-version:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \

@@ -265,6 +266,7 @@ install-data-yes: all
 
 install-strip: install
 
+install-dvi install-html install-info install-pdf install-ps:
 installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@


diff --git a/po/Makevars b/po/Makevars
line changes: +12/-2
index 7687c86..69ea8f1
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,17 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --no-wrap
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
+          \
+ --flag=_:1:pass-c-format\
+ --flag=N_:1:pass-c-format\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format\
+\
+ --from-code=UTF-8\
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\
+ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\
+ --flag=wrapf:1:c-format\
+ $${end_of_xgettext_options+}
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

@@ -38,4 +48,4 @@ MSGID_BUGS_ADDRESS = bug-hello@gnu.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
+EXTRA_LOCALE_CATEGORIES = 


diff --git a/po/bg.po b/po/bg.po
line changes: +70/-98
index a839fcf..10e1d98
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,26 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.3.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2007-07-26 10:13-0700\n"
 "PO-Revision-Date: 2007-08-02 17:59+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\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:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: излишен операнд: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Използвайте „%s --help“ за повече информация\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "здравей, свят\n"

@@ -39,7 +38,7 @@ msgstr "здравей, свят\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:113
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -52,26 +51,26 @@ msgstr ""
 "\n"
 "[Забележка: За най-добре изглеждащ изход, моля използвайте кодиране UTF-8.]\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "Здравей, свят!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Използване: %s [ОПЦИЯ]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Извежда дружелюбен поздрав, който може да се настройва.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -91,154 +90,127 @@ msgstr ""
 "  -n, --next-generation   използва формат за поздрав от ново поколение\n"
 "  -g, --greeting=ТЕКСТ    използва ТЕКСТ като поздравително съобщение\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"Съобщавайте за програмни грешки на <%s>.\n"
-"За грешки в българския превод на <dict@fsa-bg.org>\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:169
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Съобщавайте за програмни грешки на <%s>.\n"
 "За грешки в българския превод на <dict@fsa-bg.org>\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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 ""
 "Авторски права: © %s Free Software Foundation, Inc.\n"
-"Лицензия: GNU GPL версия 3 или следваща <http://www.gnu.org/licenses/gpl."
-"html>\n"
+"Лицензия: GNU GPL версия 3 или следваща <http://www.gnu.org/licenses/gpl.html>\n"
 "Това е свободен софтуер: свободни сте да го променяте и разпространявате.\n"
 "НЕ СЕ ДАВАТ НИКАКВИ ГАРАНЦИИ, доколкото закона позволява това.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:126
 msgid "Unknown system error"
 msgstr "Непозната системна грешка"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: опцията „%s“ е двусмислена\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: опцията „--%s“ не допуска аргумент\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: опцията „%c%s“ не допуска аргумент\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: опцията „%s“ изисква аргумент\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: непозната опция „--%s“\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: непозната опция „%c%s“\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: неправилна опция -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: опцията изисква аргумент -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: опцията „-W %s“ е двусмислена\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: опцията „-W %s“ не допуска аргумент\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опцията „%s“ изисква аргумент\n"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:229
 msgid "`"
 msgstr "„"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:230
 msgid "'"
 msgstr "“"
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: неправилна опция -- %c\n"
-
 #~ msgid "Too many arguments\n"
 #~ msgstr "Твърде много аргументи\n"
 


diff --git a/po/ca.po b/po/ca.po
line changes: +32/-37
index 9fd0965..13d65d8
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-11 22:35+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"

@@ -115,80 +115,77 @@ msgstr "Pàgina inicial de %s: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Ajuda general sobre l'ús de programari GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Ajuda general sobre l'ús de programari GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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"
-"GPLv3+: llicència GNU GPL ver. 3 o posterior <http://gnu.org/licenses/gpl."
-"html>\n"
+"GPLv3+: llicència GNU GPL ver. 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
 "Aquest és programari lliure: podeu modificar‐lo i redistribuir‐lo si voleu.\n"
 "No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "S'ha produït un error del sistema desconegut"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: l'opció «%s» és ambigua\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l'opció «--%s» no admet arguments\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opció «%c%s» no admet arguments\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l'opció «--%s» necessita un argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: l'opció «--%s» no és reconeguda\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: l'opció «%c%s» no és reconeguda\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l'opció «%c» no és vàlida\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s l'opció «%c» necessita un argument\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l'opció «-W %s» és ambigua\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opció «-W %s» no admet arguments\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: l'opció «-W %s» necessita un argument\n"

@@ -199,30 +196,28 @@ msgstr "s'ha produït un error d'escriptura"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "«"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "»"
 


diff --git a/po/da.po b/po/da.po
line changes: +34/-43
index d0f60fc..7bd8a85
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-12 07:24+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

@@ -99,16 +99,12 @@ msgstr ""
 #: src/hello.c:179
 #, c-format
 msgid "Report bugs to: %s\n"
-msgstr ""
-"Rapport�r fejl til %s. Rapport�r fejl med danske overs�ttelser til "
-"<dansk@dansk-gruppen.dk>\n"
+msgstr "Rapport�r fejl til %s. Rapport�r fejl med danske overs�ttelser til <dansk@dansk-gruppen.dk>\n"
 
 #: src/hello.c:182
 #, c-format
 msgid "Report %s bugs to: %s\n"
-msgstr ""
-"Rapport�r %s fejl til: %s. Rapport�r fejl med danske overs�ttelser til "
-"<dansk@dansk-gruppen.dk>\n"
+msgstr "Rapport�r %s fejl til: %s. Rapport�r fejl med danske overs�ttelser til <dansk@dansk-gruppen.dk>\n"
 
 #: src/hello.c:186
 #, c-format

@@ -122,80 +118,77 @@ msgstr "%s hjemmeside: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Generel hj�lp til brug af GNU-programmer: <http://www.gnu.org/gethelp/>\n"
+msgstr "Generel hj�lp til brug af GNU-programmer: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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 ""
 "Ophavsret � %s Free Software Foundation, Inc.\n"
-"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl."
-"html>\n"
+"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
 "Dette er frit programmel: du m� gerne �ndre og redistribuere det.\n"
 "Der er ikke nogen GARANTIER, i det omfang loven tillader dette.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalg '%s' er flertydigt\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '--%s' tillader ikke et argument\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '%c%s' tillader ikke et argument\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tilvalg '--%s' kr�ver et argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg - %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalg kr�ver et argument - '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalg '-W %s' er flertydigt\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '-W %s' tillader ikke et argument\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tilvalg '-w %s' kr�ver et argument\n"

@@ -206,30 +199,28 @@ msgstr "skrivefejl"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "'"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "'"
 


diff --git a/po/de.po b/po/de.po
line changes: +35/-44
index 59a0fc4..07d7ca8
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-12 22:19+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"

@@ -86,8 +86,7 @@ msgid ""
 "  -g, --greeting=TEXT     use TEXT as the greeting message\n"
 msgstr ""
 "  -t, --traditional       Traditionelles Begrüßungsformat verwenden\n"
-"  -n, --next-generation   Begrüßungsformat der „Nächsten Generation“ "
-"verwenden\n"
+"  -n, --next-generation   Begrüßungsformat der „Nächsten Generation“ verwenden\n"
 "  -g, --greeting=TEXT     TEXT als Begrüßungsmeldung verwenden\n"
 
 # Add address for the german translation.

@@ -102,8 +101,7 @@ msgstr ""
 msgid "Report bugs to: %s\n"
 msgstr ""
 "Melden Sie Fehler an: %s\n"
-"Melden Sie Übersetzungsfehler an: <translation-team-de@lists.sourceforge."
-"net>\n"
+"Melden Sie Übersetzungsfehler an: <translation-team-de@lists.sourceforge.net>\n"
 
 # Add address for the german translation.
 # 2000-03-13 05:50:49 CET -ke-

@@ -112,8 +110,7 @@ msgstr ""
 msgid "Report %s bugs to: %s\n"
 msgstr ""
 "Melden Sie Fehler in %s an: %s\n"
-"Melden Sie Übersetzungsfehler an: <translation-team-de@lists.sourceforge."
-"net>\n"
+"Melden Sie Übersetzungsfehler an: <translation-team-de@lists.sourceforge.net>\n"
 
 #: src/hello.c:186
 #, c-format

@@ -127,81 +124,77 @@ msgstr "%s-Homepage: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Allgemeine Hilfe zum Benutzen von GNU-Software: <http://www.gnu.org/gethelp/"
-">\n"
+msgstr "Allgemeine Hilfe zum Benutzen von GNU-Software: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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"
-"Lizenz: GPLv3+: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl."
-"html>\n"
+"Lizenz: GPLv3+: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl.html>\n"
 "Dies ist Freie Software: Sie dürfen sie ändern und weiterverteilen.\n"
 "Es gibt KEINE GARANTIE, soweit es das Gesetz zulässt.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erlaubt kein Argument\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Option »%s« verlangt ein Argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: Unbekannte Option »--%s«\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: Unbekannte Option »%c%s«\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Unerlaubte Option -- »%c«\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option verlangt ein Argument -- »%c«\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: Option »-W %s« verlangt ein Argument\n"

@@ -212,30 +205,28 @@ msgstr "Schreibfehler"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "»"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "«"
 


diff --git a/po/el.po b/po/el.po
line changes: +33/-40
index bf5060f..a1f8bb3
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-06 11:49+0100\n"
 "Last-Translator: Savvas Radevic <vicedar@gmail.com>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"

@@ -115,82 +115,77 @@ msgstr "%s ιστοσελίδα: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Γενική βοήθεια για να χρησιμοποιήσετε το λογισμικό GNU: <http://www.gnu.org/"
-"gethelp/>\n"
+msgstr "Γενική βοήθεια για να χρησιμοποιήσετε το λογισμικό GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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+: GNU GPL έκδοση 3 ή μεταγενέστερη <http://gnu.org/"
-"licenses/gpl.html>\n"
-"Αυτό είναι ελεύθερο λογισμικό: Είστε ελεύθεροι να το αλλάξετε και να το "
-"αναδιανέμετε.\n"
+"Άδεια χρήσης GPLv3+: GNU GPL έκδοση 3 ή μεταγενέστερη <http://gnu.org/licenses/gpl.html>\n"
+"Αυτό είναι ελεύθερο λογισμικό: Είστε ελεύθεροι να το αλλάξετε και να το αναδιανέμετε.\n"
 "Δεν υπάρχει ΚΑΜΙΑ ΕΓΓΥΗΣΗ στην έκταση που επιτρέπεται από το νόμο.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Άγνωστο σφάλμα συστήματος"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: η επιλογή '%s' είναι διφορούμενη\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: η επιλογή '--%s' δεν δέχεται ορίσματα\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: η επιλογή '%c%s' δεν δέχεται ορίσματα\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: η επιλογή '--%s' απαιτεί όρισμα\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: μη αναγνωρίσιμη επιλογή '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: μη αναγνωρίσιμη επιλογή '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: μη έγκυρη επιλογή -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: η επιλογή απαιτεί ένα όρισμα -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: η επιλογή '-W %s' είναι δοφορούμενη\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: η επιλογή '-W %s' δεν δέχεται ορίσματα\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: η επιλογή '-W %s' απαιτεί όρισμα\n"

@@ -201,30 +196,28 @@ 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "«"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "»"
 


diff --git a/po/eo.po b/po/eo.po
line changes: +39/-44
index 15dbdbc..f28f4ac
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,14 +1,14 @@
 # Esperantaj mesaĝoj por GNU hello.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # This file is distributed under the same license as the hello package.
-# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2001-2002, 2006-2007, 2010.
+# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2001-2002, 2006-2007, 2010-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU hello 2.4.90\n"
+"Project-Id-Version: GNU hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
-"PO-Revision-Date: 2010-02-02 20:02+0000\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
+"PO-Revision-Date: 2011-04-16 22:16+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"

@@ -120,76 +120,74 @@ msgstr "Ĝenerala helpo pri GNU-programoj: <http://www.gnu.org/gethelp/>\n"
 #, 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 ""
 "Kopirajto (C) %s Free Software Foundation, Inc.\n"
-"Rajtigilo GPLv3+: GNU-GPL versio 3 aŭ posta <http://www.gnu.org/licenses/gpl."
-"html>\n"
+"Rajtigilo GPLv3+: GNU-GPL versio 3 aŭ posta <http://www.gnu.org/licenses/gpl.html>\n"
 "Ĉi tio estas libera programo: vi rajtas ŝanĝi kaj pludoni kopiojn.\n"
 "Estas NENIA GARANTIO, laŭ la grado leĝe permesata.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcio '%s' estas plursenca\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opcio '--%s' ne allasas argumenton\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opcio '%c%s' ne allasas argumenton\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
+#, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcio '%s' bezonas argumenton\n"
+msgstr "%s: opcio '--%s' bezonas argumenton\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nerekonata opcio '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nerekonata opcio '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nevalida opcio -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcio bezonas argumenton -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcio '-W %s' estas plursenca\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opcio '-W %s' ne allasas argumenton\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
+#, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcio '%s' bezonas argumenton\n"
+msgstr "%s: opcio '-W %s' bezonas argumenton\n"
 
 #: gnulib/lib/closeout.c:112
 msgid "write error"

@@ -197,30 +195,28 @@ msgstr "skriberaro"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "“"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "”"
 

@@ -237,8 +233,7 @@ msgstr "memoro elĉerpiĝis"
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the "
-#~ "terms\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the terms\n"
 #~ "of the GNU General Public License.\n"
 #~ "For more information about these matters, see the file named COPYING.\n"
 #~ msgstr ""


diff --git a/po/es.po b/po/es.po
line changes: +36/-46
index 8089633..636a287
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-18 13:19+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"

@@ -123,81 +123,77 @@ msgstr "%s página inicial: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/"
-">\n"
+msgstr "Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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"
-"Licencia GPLv3+: GPL de GNU versión 3 o posterior <http://gnu.org/licenses/"
-"gpl.html>\n"
+"Licencia GPLv3+: GPL de GNU versión 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
 "Esto es software libre, usted es libre de cambiarlo y redistribuirlo.\n"
 "No hay NINGUNA GARANTÍA, hasta donde permite la ley.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: la opción '--%s' no admite ningún argumento\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: la opción '--%s' requiere un argumento\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción inválida -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la opción requiere un argumento -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: la opción '-W %s' requiere un argumento\n"

@@ -208,30 +204,28 @@ msgstr "error de escritura"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "«"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "»"
 

@@ -251,19 +245,15 @@ msgstr "memoria agotada"
 #~ 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 ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
-#~ "UN\n"
-#~ "FIN DETERMINADO. Se pueden redistribuir copias de GNU %s bajo los "
-#~ "términos\n"
+#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n"
+#~ "FIN DETERMINADO. Se pueden redistribuir copias de GNU %s bajo los términos\n"
 #~ "de la Licencia Pública General de GNU.\n"
-#~ "Para más información sobre estas cuestiones, vea el fichero llamado "
-#~ "COPYING.\n"
+#~ "Para más información sobre estas cuestiones, vea el fichero llamado COPYING.\n"
 
 #~ msgid "%s: Incompatible flags: -m and -t\n"
 #~ msgstr "%s: Opciones incompatibles: -m y -t\n"


diff --git a/po/et.po b/po/et.po
line changes: +32/-37
index 4349cb5..1dfebac
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.6.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-22 11:48-0700\n"
 "PO-Revision-Date: 2011-03-23 21:51+0200\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"

@@ -120,73 +120,70 @@ msgstr "
 #, 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 ""
 "Autori�igus (C) %s Free Software Foundation, Inc.\n"
-"Litsents GPLv3+: GNU GPL versioon 3 v�i uuem <http://www.gnu.org/licenses/"
-"gpl.html>\n"
-"See on vaba tarkvara. Garantii puudub vastavalt seadustega m��ratud "
-"piiridele.\n"
+"Litsents GPLv3+: GNU GPL versioon 3 v�i uuem <http://www.gnu.org/licenses/gpl.html>\n"
+"See on vaba tarkvara. Garantii puudub vastavalt seadustega m��ratud piiridele.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemi viga"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: v�ti '%s' on segane\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: v�ti '--%s' ei luba argumenti\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: v�ti '%c%s' ei luba argumenti\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: v�ti '--%s' n�uab argumenti\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu v�ti '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu v�ti '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane v�ti -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: v�ti n�uab argumenti -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: v�ti  '-W %s' on segane\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: v�ti '-W %s' ei luba argumenti\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: v�ti '-W %s' n�uab argumenti\n"

@@ -197,30 +194,28 @@ msgstr "viga kirjutamisel"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "'"
 


diff --git a/po/eu.po b/po/eu.po
line changes: +125/-201
index bf9ae8c..344efd5
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,262 +3,186 @@
 # This file is distributed under the same license as the hello package.
 # Mikel Olasagasti <hey_neken@euskal.org>, 2003.
 # , fuzzy
-#
-#
+# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\n"
 "PO-Revision-Date: 2003-12-02 14:36+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@euskal.org>\n"
 "Language-Team: Basque <linux-eu@chanae.alphanet.ch>\n"
-"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Saiatu `%s --help' -rekin informazio gehiagorako.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' aukerak ez du argudiorik onartzen\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "kaixo, mundu\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' aukerak ez du argudiorik onartzen\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Kaixo, mundu! |\n"
-"+---------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' aukerak argudio bat behar du\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Kaixo, mundu!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: aukera ezezaguna `--%s'\n"
+
+#: src/getopt.c:774
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: aukera ezezaguna `%c%s'\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: src/getopt.c:800
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: legez kanpoko aukera -- %c\n"
+
+#: src/getopt.c:803
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: legez kanpoko aukera -- %c\n"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: aukerak argudio bat behar du -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' aukera anbiguoa da\n"
+
+#: src/getopt.c:898
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n"
+
+#: src/hello.c:164
+msgid "Too many arguments\n"
+msgstr "Argumentu gehiegi\n"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Saiatu `%s --help' -rekin informazio gehiagorako.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Erabilpena: %s [AUKERA]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, ongietorri programa.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Erabilpena: %s [AUKERA]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
 msgstr ""
 "  -h, --help          laguntza hau erakutsi eta irten egiten da\n"
-"  -v, --version       bertsioari buruzko informazioa erakutsi eta irten "
-"egiten da\n"
+"  -v, --version       bertsioari buruzko informazioa erakutsi eta irten egiten da\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
+#. TRANSLATORS: --help output 4 : options 2/2
 #. no-wrap
-#: src/hello.c:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       ongi etorri formatu tradizionala erabili\n"
 "  -n, --next-generation   hurrengo generazioko ongi etorri formatua erabili\n"
 "  -m, --mail              zure mail-a erakutsi\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Bug-ak <%s>ra bidali.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Bug-ak <%s>ra bidali.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Bug-ak <%s>ra bidali.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
+"EZ dago inolako bermerik, ez MERKATARITZA ezta ASMO BEREZI BATEN\n"
+"EGOKITASUNERAKO.  GNU %sren kopiak GNUren GPL baldintzapean egini behar duzu.\n"
+"Gai honi buruz informazio gehiago nahi baduzu, ikusi COPYING fitxategia.\n"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: `%s' aukera anbiguoa da\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' aukerak ez du argudiorik onartzen\n"
-
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' aukerak ez du argudiorik onartzen\n"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: `%s' aukerak argudio bat behar du\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: aukera ezezaguna `--%s'\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: aukera ezezaguna `%c%s'\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: legez kanpoko aukera -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: aukerak argudio bat behar du -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Bandera bateraezina: -m eta -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' aukera anbiguoa da\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Nor zara zu?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' aukerak ez du argudiorik onartzen\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Ezin da zure mail spool fitxategia aurkitu.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' aukerak argudio bat behar du\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Ez da ezer gertatzen hemen."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "kaixo, mundu\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"| Kaixo, mundu! |\n"
+"+---------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Kaixo, mundu!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 msgstr "%s: Memori birtuala agortua\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: legez kanpoko aukera -- %c\n"
-
-#~ msgid "Too many arguments\n"
-#~ msgstr "Argumentu gehiegi\n"
-
-#~ msgid "GNU hello, THE greeting printing program.\n"
-#~ msgstr "GNU hello, ongietorri programa.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
-#~ "under the terms 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"
-#~ "EZ dago inolako bermerik, ez MERKATARITZA ezta ASMO BEREZI BATEN\n"
-#~ "EGOKITASUNERAKO.  GNU %sren kopiak GNUren GPL baldintzapean egini behar "
-#~ "duzu.\n"
-#~ "Gai honi buruz informazio gehiago nahi baduzu, ikusi COPYING fitxategia.\n"
-
-#~ msgid "%s: Incompatible flags: -m and -t\n"
-#~ msgstr "%s: Bandera bateraezina: -m eta -t\n"
-
-#~ msgid "%s: Who are you?\n"
-#~ msgstr "%s: Nor zara zu?\n"
-
-#~ msgid "%s: Cannot find your mail spool file.\n"
-#~ msgstr "%s: Ezin da zure mail spool fitxategia aurkitu.\n"
-
-#~ msgid "Nothing happens here."
-#~ msgstr "Ez da ezer gertatzen hemen."


diff --git a/po/fa.po b/po/fa.po
line changes: +131/-207
index 8fa5764..6543297
--- a/po/fa.po
+++ b/po/fa.po
@@ -5,260 +5,184 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
-"PO-Revision-Date: 2002-12-07 06:21+0100\n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\n"
+"PO-Revision-Date: 2002-12-06 22:50+0350\n"
 "Last-Translator: Behdad Esfahbod <trans@behdad.org>\n"
 "Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "‏%s: گزینه‌ی «%s» مبهم است\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "برای اطلاعات بیشتر «%s --help» را امتحان کنید.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "‏%s: گزینه‌ی «--%s» آرگومان نمی‌پذیرد\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "سلام بر همه\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "‏%s: گزینه‌ی «%c%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:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"‏‎╔═════════════╗‎\n"
-"║ سلام بر همه! ║\n"
-"‏‎╚═════════════╝‎\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "‏%s: گزینه‌ی «%s» آرگومان لازم دارد\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "سلام بر همه!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "‏%s: گزینه‌ی «--%s» شناخته نشد\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: src/getopt.c:774
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "‏%s: گزینه‌ی «%c%s» شناخته نشد\n"
+
+#: src/getopt.c:800
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "‏%s: گزینه‌ی غیرمجاز -- %c\n"
+
+#: src/getopt.c:803
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "‏%s: گزینه‌ی نامعتبر -- %c\n"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "‏%s: گزینه آرگومان لازم دارد -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "‏%s: گزینه‌ی «-W %s» مبهم است\n"
+
+#: src/getopt.c:898
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "برای اطلاعات بیشتر «%s --help» را امتحان کنید.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "طرز استفاده: ‪%s [گزینه]‏‬                                    \n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "گنو سلام، برنامه‌ی خوش‌آمدگویی.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "روش استفاده: ‪%s ‏[گزینه]‏‬\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"
 msgstr ""
-"  -h, --help           این راهنما را نشان می‌دهد و خارج می‌شود\n"
-"  -v, --version       شماره‌ی نسخه را نشان می‌دهد و خارج می‌شود\n"
+"‏  -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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
-"  -t, --traditional          استفاده از قالب خوش‌آمدگویی سنتی\n"
-"  -n, --next-generation  استفاده از قالب خوش‌آمدگویی نسل جدید\n"
-"  -m, --mail                                  چاپ نامه‌هایتان\n"
+"‏  -t‏، --traditional‏       استفاده از قالب خوش‌آمدگویی سنتی\n"
+"‏  -n‏، --next-generation‏   استفاده از قالب خوش‌آمدگویی نسل جدید\n"
+"‏  -m‏، --mail‏              چاپ نامه‌هایتان\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"اشکال‌های برنامه را به <%s>،              \n"
-"و اشکال‌های ترجمه را به <fwpg@sharif.edu> گزارش دهید.        \n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr ""
-"اشکال‌های برنامه را به <%s>،              \n"
-"و اشکال‌های ترجمه را به <fwpg@sharif.edu> گزارش دهید.        \n"
-
-#: src/hello.c:186
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <%s>\n"
+msgid "Report bugs to <%s>.\n"
 msgstr ""
+"اشکال‌های برنامه را به <%s>، و اشکال‌های\n"
+"ترجمه را به <translation-team-fa@lists.sourceforge.net> گزارش دهید.\n"
 
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
+"«مناسب کار خاصی بودن». شما مجازید کپی‌های گنو %s را تحت\n"
+"شرایط مندرج در اجازه‌نامه‌ی عمومی گنو توزیع کنید.\n"
+"برای اطلاعات بیشتر در این موارد، پرونده‌ی COPYING را ببینید.\n"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: گزینه‌ی «%s» مبهم است\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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:637 gnulib/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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: گزینه‌ی «%s» آرگومان لازم دارد\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: گزینه‌ی «--%s» شناخته نشد\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: گزینه‌ی «%c%s» شناخته نشد\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: گزینه‌ی نامعتبر -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: گزینه آرگومان لازم دارد -- %c\n"
+# "حق کپی (ح) (%s) برای بنیاد نرم‌افزار‌های آزاد محفوظ است.\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "‏%s: ‫گزینه‌های ناسازگار: ‎-m و ‎-t‬\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: گزینه‌ی «-W %s» مبهم است\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "‏%s: شما کی هستید؟\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: گزینه‌ی «-W %s» آرگومان نمی‌پذیرد\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "‏%s: پرونده‌ی نامه‌های شما یافت نشد.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: گزینه‌ی «%s» آرگومان لازم دارد\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "اتفاقی نمی‌افتد."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "سلام بر همه\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
-msgstr ""
-
-#: gnulib/lib/quotearg.c:313
-msgid "'"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"‏‎╔══════════════╗‎\n"
+"║ سلام بر همه! ║\n"
+"‏‎╚══════════════╝‎\n"
 
-#: gnulib/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 "گنو سلام، برنامه‌ی خوش‌آمدگویی.                                \n"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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"
-#~ "«مناسب کار خاصی بودن». شما مجازید رونوشت‌های گنو %s را تحت      \n"
-#~ "شرایط مندرج در اجازه‌نامه‌ی عمومی گنو توزیع کنید.                   \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"
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "سلام بر همه!"
 
-#~ msgid "Nothing happens here."
-#~ msgstr "اتفاقی نمی‌افتد."
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
+msgstr "‏%s: حافظه‌ی مجازی تمام شد\n"


diff --git a/po/fi.po b/po/fi.po
line changes: +36/-48
index 7deab68..c7645f1
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.4.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2010-01-31 11:59-0800\n"
 "PO-Revision-Date: 2010-02-01 10:29+0200\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

@@ -98,8 +97,7 @@ msgstr ""
 msgid "Report bugs to: %s\n"
 msgstr ""
 "Kerro vioista (englanniksi) osoitteeseen: %s\n"
-"Suomennoksen vioista voit ilmoittaa listalle <translation-team-fi@lists."
-"sourceforge.net>.\n"
+"Suomennoksen vioista voit ilmoittaa listalle <translation-team-fi@lists.sourceforge.net>.\n"
 
 #: src/hello.c:182
 #, c-format

@@ -118,114 +116,105 @@ msgstr "%s-kotisivu: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Yleisiä ohjeita GNU-ohjelmistojen käytöstä: <http://www.gnu.org/gethelp/>\n"
+msgstr "Yleisiä ohjeita GNU-ohjelmistojen käytöstä: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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"
-"Lisenssi GPLv3+: GNU GPL versio 3 tai uudempi <http://gnu.org/licenses/gpl."
-"html>\n"
+"Lisenssi GPLv3+: GNU GPL versio 3 tai uudempi <http://gnu.org/licenses/gpl.html>\n"
 "Tämä on vapaa ohjelmisto: sinulla on vapaus muuttaa tai levittää tätä.\n"
 "Tälle ohjelmistolle EI myönnetä takuuta lain sallimissa rajoissa.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:153
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmävirhe"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: valitsin ”%s” on monitulkintainen\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: valitsin ”%s” tarvitsee argumentin\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tuntematon valitsin ”--%s”\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin -- ”%c”\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032
+#: gnulib/lib/getopt.c:1050
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin tarvitsee argumentin -- ”%c”\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: valitsin ”-W %s” on monitulkintainen\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ”%s” tarvitsee argumentin\n"
-
 #: gnulib/lib/closeout.c:112
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:272
 msgid "`"
 msgstr "”"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:273
 msgid "'"
 msgstr "”"
 

@@ -245,8 +234,7 @@ msgstr "muisti loppui"
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the "
-#~ "terms\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the terms\n"
 #~ "of the GNU General Public License.\n"
 #~ "For more information about these matters, see the file named COPYING.\n"
 #~ msgstr ""


diff --git a/po/fr.po b/po/fr.po
line changes: +130/-208
index 649d603..e3b2ebb
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,72 +1,99 @@
 # Messages fran�ais pour GNU concernant hello.
-# Copyright � 1996 Free Software Foundation, Inc.
+# Copyright � 2004 Free Software Foundation, Inc.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
-"PO-Revision-Date: 2002-08-04 08:00-0500\n"
+"POT-Creation-Date: 2002-02-02 17:03+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'option � %s � est ambigu�.\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pour plus d'informations, faire: � %s --help �.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'option � --%s � ne permet pas un autre param�tre.\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "Bonjour, le monde.\n"
+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"
 
-#. 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:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------------+\n"
-"| Bonjour, le monde! |\n"
-"+--------------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'option � %s � requiert un param�tre.\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Bonjour, le monde!"
+#: src/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: l'option � --%s � n'est pas reconnue.\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'option -- %c requiert un param�tre.\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'option � -W %s � est ambigu�.\n"
+
+#: src/getopt.c:896
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pour plus d'informations, faire: � %s --help �.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Usage: %s [OPTION]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, LE programme de salutations et de bienvenue.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Usage: %s [OPTION]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -74,194 +101,91 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\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+ (reports)
-#. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application.  Please add _another line_ with the
-#. address for translation bugs.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Rapporter toutes anomalies � <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Rapporter toutes anomalies � <%s>.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Rapporter toutes anomalies � <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
+
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: options incompatibles: -m et -t\n"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'option � %s � est ambigu�.\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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"
-
-#: gnulib/lib/getopt.c:637 gnulib/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"
-
-#: gnulib/lib/getopt.c:685 gnulib/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"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: l'option � --%s � n'est pas reconnue.\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/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"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: l'option -- %c est invalide.\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/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"
-
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'option � -W %s � est ambigu�.\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Qui �tes-vous?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/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"
+#: src/hello.c:282
+#, 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"
 
-#: gnulib/lib/getopt.c:1013 gnulib/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"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Aucune activit� ne s'est produite."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "Bonjour, le monde.\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+--------------------+\n"
+"| Bonjour, le monde! |\n"
+"+--------------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Bonjour, le monde!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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"

@@ -286,10 +210,8 @@ 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: +70/-96
index 5967ae7..576dc4d
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,26 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.3\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2007-06-26 15:18-0700\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:100
+#: src/hello.c:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: oibreann breise: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, 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:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "Dia duit, a dhomhain\n"

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

@@ -48,26 +47,26 @@ msgstr ""
 "| Dia duit, a dhomhain! |\n"
 "+-----------------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Úsáid: %s [ROGHA]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 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:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -87,150 +86,125 @@ 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+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Seol tuairiscí fabhtanna chuig <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Seol tuairiscí fabhtanna chuig <%s>.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:169
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Seol tuairiscí fabhtanna chuig <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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:188
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Earráid anaithnid chórais"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Tá an rogha `%s' débhríoch\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, 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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: rogha anaithnid `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: rogha neamhbhailí -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, 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:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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/getopt.c:1013 gnulib/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"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 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
-#. "'".  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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:229
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:230
 msgid "'"
 msgstr "'"
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 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: +122/-200
index 14937a5..b123541
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,68 +5,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-02-02 17:03+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: a opci�n `%s' � ambigua\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Escriba `%s --help' para obter m�is informaci�n.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n `--%s' non admite un argumento\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "ola, mundo\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n `%c%s' non admite un argumento\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------+\n"
-"| �Ola, mundo! |\n"
-"+--------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: a opci�n `%s' precisa dun argumento\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "�Ola, mundo!"
+#: src/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opci�n `--%s' non reco�ecida\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: a opci�n precisa dun argumento -- %c\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: a opci�n `-W %s' � ambigua\n"
+
+#: src/getopt.c:896
+#, 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"
+
+#: 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"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Emprego: %s [OPCI�N]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, *O* programa que amosa sa�dos.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Emprego: %s [OPCI�N]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -74,192 +100,88 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\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+ (reports)
-#. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application.  Please add _another line_ with the
-#. address for translation bugs.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, 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:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:205
+#, 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:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opci�n `%s' � ambigua\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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"
-
-#: gnulib/lib/getopt.c:637 gnulib/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"
-
-#: gnulib/lib/getopt.c:685 gnulib/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"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opci�n `--%s' non reco�ecida\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opci�n `%c%s' non reco�ecida\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opci�n non v�lida -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/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"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Modificadores incompatibles: -m e -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opci�n `-W %s' � ambigua\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: �Quen � vostede?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/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"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Non se puido atopa-lo ficheiro co correo.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/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"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Aqu� non pasa nada."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "ola, mundo\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+--------------+\n"
+"| �Ola, mundo! |\n"
+"+--------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "�Ola, mundo!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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: +122/-197
index 87ef70e..181e697
--- a/po/he.po
+++ b/po/he.po
@@ -5,68 +5,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-02-02 17:03+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s ����� ���� �����-�� ���� `%s' ������\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr ".���� �� ���� ����� `%s --help' ����� ���\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s ����� ���� ������� ���� ���� `--%s' ������\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "!����� ��� ����\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s ����� ���� ������� ���� ���� `%c%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:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------+\n"
-"| !����� ��� ���� |\n"
-"+-----------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s ����� ���� ������� ����� `%s' ������\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "!����� ��� ����"
+#: 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"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ������� ����� ������ -- %c\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s ����� ���� �����-�� ���� `-W %s' ������\n"
+
+#: src/getopt.c:896
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr ".���� �� ���� ����� `%s --help' ����� ���\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "%s [��������]  :����� ����\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr ".���� ������ �������� �� ,GNU hello\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "%s [��������]  :����� ����\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -74,187 +100,86 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "                     .������ ������ ���� ���       -t, --traditional\n"
 "                   .��� ���� ������ ���� ���       -n, --next-generation\n"
 "                  .��� ��������� ���� �� ���       -m, --mail\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr ".<%s> ������ ����� �� ������� ����� ��\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s ����� ���� �����-�� ���� `%s' ������\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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:637 gnulib/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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s ����� ���� ������� ����� `%s' ������\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s ����� ���� `--%s' �����-���� ������\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s ����� ���� `%c%s' �����-���� ������\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s ����� ���� ���� ������ -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: ������� ����� ������ -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s ������ ���� -t ��� -m �� ����� ���� ��\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s ����� ���� �����-�� ���� `-W %s' ������\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "?��� ��� ,%s\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s ����� ���� ������� ���� ���� `-W %s' ������\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr ".��� ���� �� ���� �� ����� ����� ���� %s\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s ����� ���� ������� ����� `%s' ������\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr ".��� ���� ���� ���"
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "!����� ��� ����\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+-----------------+\n"
+"| !����� ��� ���� |\n"
+"+-----------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "!����� ��� ����"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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: +128/-204
index e96854a..daeed98
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,68 +9,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.0.50\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-02-02 17:03+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcija `%s' nije jednozna�na\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Poku�aj `%s --help' za vi�e informacija.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcija `--%s' ne dozvoljava argument\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "pozdrav, svijete\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcija `%c%s' ne dozvoljava argument\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-------------------+\n"
-"| Pozdrav, svijete! |\n"
-"+-------------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Pozdrav, svijete!"
+#: 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"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcija zahtijeva neophodan argument -- %c\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcija `-W %s' nije jednozna�na\n"
+
+#: src/getopt.c:896
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Poku�aj `%s --help' za vi�e informacija.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Kori�tenje: %s [OPCIJA]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, pozdravni program.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Kori�tenje: %s [OPCIJA]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -78,193 +104,91 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\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+ (reports)
-#. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application.  Please add _another line_ with the
-#. address for translation bugs.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
-
-#: src/hello.c:186
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Prijavi pogre�ke i bugove na adresu <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\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"
+
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Nekompatibilne zastavice: -m i -t\n"
 
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcija `%s' nije jednozna�na\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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"
-
-#: gnulib/lib/getopt.c:637 gnulib/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"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ne prepoznajem opciju `--%s'\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ne prepoznajem opciju `%c%s'\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: pogre�na opcija -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcija zahtijeva neophodan argument -- %c\n"
-
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcija `-W %s' nije jednozna�na\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Tko si ti?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/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"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Ne mogu prona�i tvoj po�tanski sandu�i� (mailbox).\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcija `%s' zahtijeva neophodan argument\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Ni�ta se ne doga�a."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "pozdrav, svijete\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+-------------------+\n"
+"| Pozdrav, svijete! |\n"
+"+-------------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Pozdrav, svijete!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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: +33/-42
index c09d473..635826a
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.4.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2010-01-31 11:59-0800\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"

@@ -125,107 +124,99 @@ msgstr ""
 #, 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:188
+#: gnulib/lib/error.c:153
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: '%s' kapcsoló nem egyértelmű\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582
 #, 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:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596
 #, 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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: a '%s' kapcsoló argumentumot igényel\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ismeretlen kapcsoló: '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ismeretlen kapcsoló: '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: érvénytelen kapcsoló -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032
+#: gnulib/lib/getopt.c:1050
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a kapcsoló argumentumot igényel -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a '-W %s' kapcsoló nem egyértelmű\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940
 #, 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/getopt.c:1013 gnulib/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"
-
 #: gnulib/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
-#. "'".  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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:272
 msgid "`"
 msgstr "U+201E"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:273
 msgid "'"
 msgstr "U+201d"
 


diff --git a/po/id.po b/po/id.po
line changes: +35/-46
index df1ade5..edd34bd
--- a/po/id.po
+++ b/po/id.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.4.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2010-01-31 11:59-0800\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"

@@ -117,115 +116,105 @@ msgstr "%s halaman rumah: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 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
 #, 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:188
+#: gnulib/lib/error.c:153
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tidak dikenal"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:529 gnulib/lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:578 gnulib/lib/getopt.c:582
 #, 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:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:591 gnulib/lib/getopt.c:596
 #, 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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:696 gnulib/lib/getopt.c:699
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tidak dikenal '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:707 gnulib/lib/getopt.c:710
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tidak dikenal '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:812 gnulib/lib/getopt.c:829 gnulib/lib/getopt.c:1032
+#: gnulib/lib/getopt.c:1050
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:882 gnulib/lib/getopt.c:898
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' ambigu\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:922 gnulib/lib/getopt.c:940
 #, 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/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n"
-
 #: gnulib/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
-#. "'".  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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 


diff --git a/po/it.po b/po/it.po
line changes: +111/-204
index 3946d23..953044b
--- a/po/it.po
+++ b/po/it.po
@@ -6,68 +6,88 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.37\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-01-31 21:27+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'opzione `%s' � ambigua\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Usare `%s --help' per ulteriori informazioni.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `--%s' non ammette un argomento\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "salve, mondo\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `%c%s' non ammette un argomento\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Salve, mondo! |\n"
-"+---------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'opzione `%s' richiede un argomento\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Salve, mondo!"
+#: src/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' opzione non riconosciuta\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
-#. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Uso: %s [OPZIONI]\n"
+#: src/getopt.c:772
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' opzione non riconosciuta\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
-#. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: 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"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'opzione `-W %s' � ambigua\n"
+
+#: src/getopt.c:896
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: l'opzione `-W %s' non ammette un argomento\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
-#. no-wrap
-#: src/hello.c:161
+#: src/hello.c:164
+msgid "Too many arguments\n"
+msgstr "Troppi argomenti\n"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Usare `%s --help' per ulteriori informazioni.\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:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Uso: %s [OPZIONI]\n"
+
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -75,187 +95,74 @@ msgstr ""
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -v, --version       mostra informazioni sulla versione ed esce\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
-#. no-wrap
-#: src/hello.c:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\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"
 
-#. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Segnalare i bug a <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Segnalare i bug a <%s>.\n"
-
-#: src/hello.c:186
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Segnalare i bug a <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione `%s' � ambigua\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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"
-
-#: gnulib/lib/getopt.c:637 gnulib/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"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l'opzione `%s' richiede un argomento\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: `--%s' opzione non riconosciuta\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: `%c%s' opzione non riconosciuta\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opzione non valida -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'opzione richiede un argomento -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Opzioni incompatibili: -m e -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'opzione `-W %s' � ambigua\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Chi sei?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/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"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Impossibile trovare il tuo file di spool della posta.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/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"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Qui non succede niente."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "salve, mondo\n"
 
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"| Salve, mondo! |\n"
+"+---------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Salve, mondo!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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: +128/-209
index c2a8c84..23ab127
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,68 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.0.50\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-02-02 17:03+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/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ���ץ���� `%s' ��ۣ��Ǥ�\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "`%s --help' �ǡ����ܺ٤ʾ����Ĵ�٤ƤߤƤ���������\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ���ץ���� `--%s' �ϰ���������դ��ޤ���\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "�����衢����ˤ���\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ���ץ���� `%c%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:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"������������������������\n"
-"�������衢����ˤ��ϡ���\n"
-"������������������������\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "�����衢����ˤ��ϡ�"
+#: src/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `--%s' �Ǥ�\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ���ץ����ϰ������׵ᤷ�ޤ� -- %c\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
+
+#: src/getopt.c:896
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "`%s --help' �ǡ����ܺ٤ʾ����Ĵ�٤ƤߤƤ���������\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "����ˡ: %s [���ץ����]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "*����*��������ɽ���ץ�����ࡢHello �� GNU �ǤǤ���\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "����ˡ: %s [���ץ����]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -75,200 +101,93 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       ����Ū�ʤ������Ĥν񼰤�Ȥ��ޤ�\n"
 "  -n, --next-generation   ������Τ������Ĥν񼰤�Ȥ��ޤ�\n"
 "  -m, --mail              ���ʤ��ؤΥ᡼���ɽ�����ޤ�\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"�Х��򸫤Ĥ����� <%s> ����𤷤Ƥ���������\n"
-"���ܸ�θ����� <ja@li.org> ����𤷤Ƥ���������\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:205
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "�Х��򸫤Ĥ����� <%s> ����𤷤Ƥ���������\n"
 "���ܸ�θ����� <ja@li.org> ����𤷤Ƥ���������\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
+
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: ξΩ���ʤ��ե饰: -m��-t\n"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: ���ץ���� `%s' ��ۣ��Ǥ�\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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:637 gnulib/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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `--%s' �Ǥ�\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ǧ���Ǥ��ʤ����ץ���� `%c%s' �Ǥ�\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ̵���ʥ��ץ����Ǥ� -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: ���ץ����ϰ������׵ᤷ�ޤ� -- %c\n"
-
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: ���������\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: ���ץ���� `-W %s' �ϡ�����������դ��ޤ���\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: ���ʤ��Υ᡼�롦���ס��롦�ե����뤬���Ĥ���ޤ���\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "�����Ǥϲ��ⵯ����ʤ���"
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "�����衢����ˤ���\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"������������������������\n"
+"�������衢����ˤ��ϡ���\n"
+"������������������������\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "�����衢����ˤ��ϡ�"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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: +70/-94
index 5fc1163..222b773
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,31 +1,30 @@
-# Georgian messages for hello*.pot.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Georgian messages for hello.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # Nugzar Nebieridze <nugzar@nebieridze.com>, 2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2007-07-26 10:13-0700\n"
 "PO-Revision-Date: 2003-02-25 13:00+0400\n"
 "Last-Translator: Nugzar Nebieridze <nugzar@nebieridze.com>\n"
 "Language-Team: Georgian <ka@li.org>\n"
-"Language: ka\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:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr ""
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "აკრიბეთ `%s --help' დამატებითი ინფორმაციისთვის.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "სალამი მსოფლიოს!\n"

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

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

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

@@ -87,36 +86,17 @@ msgstr ""
 "  -n, --next-generation   მომავალი თაობის მისალმება\n"
 "  -m, --mail              თქვენი ფოსტის ჩვენება\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
-
-#: src/hello.c:186
+#: src/hello.c:169
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "შეცდომების შესახებ გააგზავნეთ შეტყობინებები <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:187
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"

@@ -126,107 +106,103 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:126
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' პარამეტრი გაურკვეველია\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: საჭიროა `%s' პარამეტრისთვის მნიშვნელობის გადაცემა\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: უცნობი პარამეტრი `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: უცნობი პარამეტრი `--%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: არასწორი პარამეტრი -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: საჭიროა %c პარამეტრისთვის მნიშვნელობის გადაცემა\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' პარამეტრი გაურკვეველია\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' პარამეტრს მნიშვნელობა არ გადაეცემა\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: საჭიროა `%s' პარამეტრისთვის მნიშვნელობის გადაცემა\n"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:229
 msgid "`"
 msgstr ""
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:230
 msgid "'"
 msgstr ""
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 #, 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: +68/-94
index 40bfa25..9b777a4
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,26 +11,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.3.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2008-11-07 02:26+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:100
+#: src/hello.c:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: 추가 오퍼렌드: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "더 많이 알아 보려면 `%s --help' 옵션을 사용하십시오.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "안녕, 여러분\n"

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

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

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

@@ -91,146 +90,121 @@ msgstr ""
 "  -n, --next-generation   신세대 인사말 형식을 사용합니다\n"
 "  -g, --greeting=<텍스트> <텍스트>를 인사말로 사용합니다\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "버그는 %s 주소로 알려 주십시오.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "버그는 %s 주소로 알려 주십시오.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:169
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "버그는 %s 주소로 알려 주십시오.\n"
 
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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:188
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' 옵션은 인수가 필요 없습니다\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' 옵션은 인수가 필요 없습니다\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: 틀린 옵션 -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: 인수가 필요한 옵션입니다 -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' 옵션은 모호한 옵션입니다\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
-
 #: gnulib/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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:266
 msgid "`"
 msgstr "“"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:267
 msgid "'"
 msgstr "”"
 
 #: gnulib/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: +37/-48
index 5af865d..639cea9
--- 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: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-22 11:48-0700\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,8 +16,7 @@ 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

@@ -118,81 +117,77 @@ msgstr "%s mājas lapa: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 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
 #, 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:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nezināma sistēmas kļūda"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcija \"%s\" nav viennozīmīga\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opcija \"--%s\" neatļauj argumentu\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, 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:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcijai \"--%s\" nepieciešams arguments\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neatpazīta opcija \"--%s\"\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neatpazita opcija \"%c%s\"\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nederiga opcija -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcijai nepieciešams arguments -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcija \"-W %s\" nav viennozīmīga\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, 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:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcijai \"-W %s\" nepieciešams arguments\n"

@@ -203,30 +198,28 @@ 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
-#. "'".  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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "\""
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "\""
 

@@ -262,8 +255,7 @@ 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 ""

@@ -287,13 +279,10 @@ 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: +68/-94
index 1145ab0..06dcabf
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,27 +8,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.3.91\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2008-11-07 02:26+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:100
+#: src/hello.c:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: operan lebihan: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Cuba `%s --help' untuk lebih maklumat.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "Hello, Duniaku\n"

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

@@ -50,26 +49,26 @@ msgstr ""
 "| Hello, Duniaku! |\n"
 "+---------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "Hello, Duniaku!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Penggunaan: %s [PILIHAN]\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 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:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -89,146 +88,121 @@ msgstr ""
 "  -n, --next-generation  menggunakan format ucapan generasi akan datang\n"
 "  -g, --greeting=TEKS    guna TEKS untuk ucapselamat\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Laporkan pepijat kepada <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Laporkan pepijat kepada <%s>.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:169
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Laporkan pepijat kepada <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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:188
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ralat sistem tidak diketahui"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: pilihan `%s' adalah kabur\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `--%s' tidak mengizinkan hujah\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593
+#, 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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: pilihan `%s' memerlukan hujah\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: pilihan tidak dapat dikenalpasti `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: pilihan tidak dapat dikenalpasti `%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: pilihan tidak sah -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: pilihan memerlukan hujah -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: pilihan `-W %s' adalah kabur\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: pilihan `%s' memerlukan hujah\n"
-
 #: gnulib/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
-#. "'".  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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:266
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:267
 msgid "'"
 msgstr "'"
 
 #: gnulib/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: +125/-201
index 1f800a5..bdbe6e7
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,68 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\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/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagget �%s� er flertydig\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pr�v med �%s --help� for mer informasjon.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flagget �--%s� tar ikke argumenter\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "hei, verden\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget �%c%s� tar ikke argumenter\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+--------------+\n"
-"| Hei, verden! |\n"
-"+--------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagget �%s� beh�ver et argument\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Hei, verden!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent flagg �--%s�\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: 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"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagg beh�ver et argument -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagg �-W %s� er flertydig\n"
+
+#: src/getopt.c:898
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pr�v med �%s --help� for mer informasjon.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Bruk: %s [FLAGG]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, Det utimate hilsningsskriveprogrammet.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Bruk: %s [FLAGG]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -75,195 +101,93 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\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+ (reports)
-#. TRANSLATORS: the placeholder indicates the bug-reporting address
-#. for this application.  Please add _another line_ with the
-#. address for translation bugs.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Rapporter feil til <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Rapporter feil til <%s>.\n"
-
-#: src/hello.c:186
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Rapporter feil til <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\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"
 
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flagget �%s� er flertydig\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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"
-
-#: gnulib/lib/getopt.c:637 gnulib/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"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flagget �%s� beh�ver et argument\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent flagg �--%s�\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent flagg �%c%s�\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ulovlig flagg -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Ukompatible flagg: -m og -t\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flagg beh�ver et argument -- %c\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Hvem er du?\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flagg �-W %s� er flertydig\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Kan ikke finne mail-filen din.\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/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"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Her skjer ingen ting."
 
-#: gnulib/lib/getopt.c:1013 gnulib/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"
-
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "hei, verden\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+--------------+\n"
+"| Hei, verden! |\n"
+"+--------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Hei, verden!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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"
-
-#, fuzzy
-#~ 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\n"
-#~ "under the terms 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"


diff --git a/po/nl.po b/po/nl.po
line changes: +32/-37
index 0c591d9..6362788
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-12 10:37+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"

@@ -125,80 +125,77 @@ msgstr "Webpagina van '%s': <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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"
-"Licentie GPLv3+: GNU GPL versie 3 of nieuwer <http://gnu.org/licenses/gpl."
-"html>\n"
+"Licentie GPLv3+: GNU GPL versie 3 of nieuwer <http://gnu.org/licenses/gpl.html>\n"
 "Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: optie '--%s' vereist een argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: optie '-W %s' vereist een argument\n"

@@ -209,30 +206,28 @@ msgstr "schrijffout"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "‘"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "’"
 


diff --git a/po/nn.po b/po/nn.po
line changes: +115/-212
index 259db8c..4652271
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,68 +7,88 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 1.3.37\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-01-31 21:27+0100\n"
 "PO-Revision-Date: 2002-02-02 17:10+0100\n"
 "Last-Translator: Kjetil Torgrim Homme <kjetilho@linpro.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:691
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagget �%s� er fleirtydig\n"
 
-#: src/hello.c:102
+#: src/getopt.c:716
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pr�v �%s --help� for meir informasjon.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flagget �--%s� tek ikkje argument\n"
 
-#: src/hello.c:109
+#: src/getopt.c:721
 #, c-format
-msgid "hello, world\n"
-msgstr "hei, verda\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget �%c%s� tek ikkje noko argument\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:739 src/getopt.c:912
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"|  Hei, verda!  |\n"
-"+---------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagget �%s� treng eit argument\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Hei, verda!"
+#: src/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent flagg �--%s�\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
-#. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Bruk: %s [FLAGG]\n"
+#: src/getopt.c:772
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent flagg �%c%s�\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
-#. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/getopt.c:798
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovleg flagg -- %c\n"
+
+#: src/getopt.c:801
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ulovleg flagg -- %c\n"
+
+#: src/getopt.c:831 src/getopt.c:961
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagget treng eit argument -- %c\n"
+
+#: src/getopt.c:878
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagget �-W %s� er fleirtydig\n"
+
+#: src/getopt.c:896
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flagget �-W %s� tek ikkje noko argument\n"
+
+#: src/hello.c:164
+msgid "Too many arguments\n"
+msgstr "For mange argument\n"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pr�v �%s --help� for meir informasjon.\n"
+
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, det BESTE programmet til � skriva helsingar.\n"
+
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Bruk: %s [FLAGG]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
-#. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -76,196 +96,79 @@ msgstr ""
 "  -h, --help          vis denne hjelpeteksten og avslutt\n"
 "  -v, --version       vis programversjon og avslutt\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
-#. no-wrap
-#: src/hello.c:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       bruk tradisjonelt format p� helsinga\n"
 "  -n, --next-generation   bruk nestegenerasjonsformat p� helsinga\n"
 "  -m, --mail              vis fram eposten din\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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"Rapporter programfeil til <%s>.\n"
-"Feil i den norske teksten kan meldast til <i18n-nn@lister.ping.uio.no>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:205
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Rapporter programfeil til <%s>.\n"
 "Feil i den norske teksten kan meldast til <i18n-nn@lister.ping.uio.no>.\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flagget �%s� er fleirtydig\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flagget �--%s� tek ikkje argument\n"
-
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget �%c%s� tek ikkje noko argument\n"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flagget �%s� treng eit argument\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent flagg �--%s�\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent flagg �%c%s�\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ulovleg flagg -- %c\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 ""
+"(Fylgjande tekst er ei omsetjing som *kun* vert gitt p� informativ basis.\n"
+"For alle juridiske tolkingar gjeld den engelske originalteksten.)\n"
+"\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Der er INGA FORM FOR garanti; ikkje eingong for at produktet er eigna for\n"
+"SAL eller BRUK TIL NOKO FORM�L.  Du kan redistribuere kopiar av GNU %s\n"
+"under vilk�ra i GNU General Public License.\n"
+"For meir informasjon om dette, sj� fila med namnet COPYING.\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flagget treng eit argument -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Flagga -m og -t kan ikkje kombinerast.\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flagget �-W %s� er fleirtydig\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Kven er du?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flagget �-W %s� tek ikkje noko argument\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Kan ikkje finne epost-fila di.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flagget �%s� treng eit argument\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Her skjer ingen ting."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "hei, verda\n"
 
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"|  Hei, verda!  |\n"
+"+---------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Hei, verda!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 msgstr "%s: Virtuelt minne oppbrukt\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ulovleg flagg -- %c\n"
-
-#~ msgid "Too many arguments\n"
-#~ msgstr "For mange argument\n"
-
-#~ msgid "GNU hello, THE greeting printing program.\n"
-#~ msgstr "GNU hello, det BESTE programmet til � skriva helsingar.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
-#~ "under the terms of the GNU General Public License.\n"
-#~ "For more information about these matters, see the file named COPYING.\n"
-#~ msgstr ""
-#~ "(Fylgjande tekst er ei omsetjing som *kun* vert gitt p� informativ "
-#~ "basis.\n"
-#~ "For alle juridiske tolkingar gjeld den engelske originalteksten.)\n"
-#~ "\n"
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Der er INGA FORM FOR garanti; ikkje eingong for at produktet er eigna "
-#~ "for\n"
-#~ "SAL eller BRUK TIL NOKO FORM�L.  Du kan redistribuere kopiar av GNU %s\n"
-#~ "under vilk�ra i GNU General Public License.\n"
-#~ "For meir informasjon om dette, sj� fila med namnet COPYING.\n"
-
-#~ msgid "%s: Incompatible flags: -m and -t\n"
-#~ msgstr "%s: Flagga -m og -t kan ikkje kombinerast.\n"
-
-#~ msgid "%s: Who are you?\n"
-#~ msgstr "%s: Kven er du?\n"
-
-#~ msgid "%s: Cannot find your mail spool file.\n"
-#~ msgstr "%s: Kan ikkje finne epost-fila di.\n"
-
-#~ msgid "Nothing happens here."
-#~ msgstr "Her skjer ingen ting."


diff --git a/po/pl.po b/po/pl.po
line changes: +32/-37
index 4c212b7..e0ed389
--- a/po/pl.po
+++ b/po/pl.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: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-22 11:48-0700\n"
 "PO-Revision-Date: 2011-03-23 21:30+0100\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"

@@ -124,74 +124,71 @@ msgstr "Pomoc w używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n"
 #, 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"
-"Licencja GPLv3+: GNU GPL wersja 3 albo późniejsza  <http://gnu.org/licenses/"
-"gpl.html>\n"
-"To jest wolne oprogramowanie. Autorzy nie dają ŻADNYCH gwarancji w "
-"granicach\n"
+"Licencja GPLv3+: GNU GPL wersja 3 albo późniejsza  <http://gnu.org/licenses/gpl.html>\n"
+"To jest wolne oprogramowanie. Autorzy nie dają ŻADNYCH gwarancji w granicach\n"
 "dozwolonych prawem.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcja '%s' jest niejednoznaczna\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opcja '--%s' nie może mieć argumentu\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opcja '%c%s' nie może mieć argumentu\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcja '--%s' wymaga argumentu\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nierozpoznana opcja '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nierozpoznana opcja '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nielegalna opcja -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga argumentu -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opcja '-W %s' nie może mieć argumentu\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcja '-W %s' wymaga argumentu\n"

@@ -202,30 +199,28 @@ msgstr "błąd zapisu"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "„"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "\""
 


diff --git a/po/pt.po b/po/pt.po
line changes: +100/-205
index 257d8bf..5bf0e8d
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,252 +5,147 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 1.3.4\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 1998-12-11 16:31+0100\n"
 "PO-Revision-Date: 1996-04-29 10:35\n"
 "Last-Translator: Ant�nio Jo�o Rendas <arendas@telepac.pt>\n"
 "Language-Team: Portugu�s <pt@li.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:582
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
-
-#: src/hello.c:102
-#, fuzzy, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Usa `%s --help' para mais informa��o\n"
-
-#: src/hello.c:109
-#, c-format
-msgid "hello, world\n"
-msgstr "ol�, mundo\n"
-
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
-#, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Ol�, mundo!"
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
-#. no-wrap
-#: src/hello.c:150
+#: src/getopt.c:606
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr ""
-
-#. TRANSLATORS: --help output 2 (brief description)
-#. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
-
-#. TRANSLATORS: --help output 3: options 1/2
-#. no-wrap
-#: src/hello.c:161
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit\n"
-msgstr ""
-
-#. TRANSLATORS: --help output 4: options 2/2
-#. no-wrap
-#: src/hello.c:168
-msgid ""
-"  -t, --traditional       use traditional greeting format\n"
-"  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
-msgstr ""
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: a op��o `--%s' n�o admite um argumento\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:179
+#: src/getopt.c:611
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: a op��o `%c%s' n�o admite um argumento\n"
 
-#: src/hello.c:182
+#: src/getopt.c:628 src/getopt.c:801
 #, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr ""
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: a op��o `%s' requer um argumento\n"
 
-#: src/hello.c:186
+#. --option
+#: src/getopt.c:657
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op��o desconhecida `--%s'\n"
 
-#: src/hello.c:188
+#. +option or -option
+#: src/getopt.c:661
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op��o desconhecida `%c%s'\n"
 
-#: src/hello.c:209
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:687
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a op��o `%s' � amb�gua\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a op��o `--%s' n�o admite um argumento\n"
-
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a op��o `%c%s' n�o admite um argumento\n"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a op��o `%s' requer um argumento\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: op��o desconhecida `--%s'\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: op��o desconhecida `%c%s'\n"
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op��o ilegal -- %c\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: src/getopt.c:690
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: op��o ilegal -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: src/getopt.c:721 src/getopt.c:850
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: a op��o `%s' requer um argumento\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: src/getopt.c:767
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: src/getopt.c:786
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a op��o `--%s' n�o admite um argumento\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a op��o `%s' requer um argumento\n"
+#: src/hello.c:147
+msgid "Too many arguments\n"
+msgstr "Demasiados argumentos\n"
+
+#: src/hello.c:148
+#, c-format
+msgid "Try `%s --help' for more information\n"
+msgstr "Usa `%s --help' para mais informa��o\n"
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
+#. Print help info and exit.
+#: src/hello.c:158
+#, fuzzy, c-format
+msgid ""
+"This is GNU Hello, THE greeting printing program.\n"
+"Usage: %s [OPTION]\n"
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit\n"
+"  -t, --traditional   use traditional greeting format\n"
+"  -m, --mail          print your mail\n"
+"\n"
+"Report bugs to bug-gnu-hello@prep.ai.mit.edu.\n"
+msgstr ""
+"Isto � o GNU Hello, O programa de sauda��es.\n"
+"\n"
+"Utiliza��o:\n"
+"\n"
+"    %s [-htvm] [--help] [--version] [--traditional] [--mail]\n"
+"\n"
+"  -h, --help          mostrar esta ajuda e sair\n"
+"  -v, --version       mostrar informa��o sobre a vers�o e sair\n"
+"\n"
+"  -t, --traditional   usar o formato de sauda��o tradicional\n"
+"  -m, --mail          imprimir o teu correio\n"
+
+#: src/hello.c:177
+#, c-format, no-wrap
+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 ""
 
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:188
+#, c-format
+msgid "%s: incompatible flags: -m and -t\n"
 msgstr ""
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
+#: src/hello.c:220
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Quem �s tu?\n"
+
+#: src/hello.c:242
+#, c-format
+msgid "%s: cannot find your mail spool file.\n"
 msgstr ""
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
-msgstr "%s: nao h� mais mem�ria virtual\n"
+#: src/hello.c:286
+msgid "Nothing happens here."
+msgstr "Aqui n�o se passa nada."
+
+#: src/hello.c:292
+msgid "hello, world\n"
+msgstr "ol�, mundo\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op��o ilegal -- %c\n"
-
-#~ msgid "Too many arguments\n"
-#~ msgstr "Demasiados argumentos\n"
-
-#~ msgid "%s: Who are you?\n"
-#~ msgstr "%s: Quem �s tu?\n"
-
-#~ msgid "Nothing happens here."
-#~ msgstr "Aqui n�o se passa nada."
-
-#, fuzzy
-#~ msgid ""
-#~ "GNU hello, THE greeting printing program.\n"
-#~ "\n"
-#~ "Usage: %s [OPTION]\n"
-#~ "\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -v, --version       display version information and exit\n"
-#~ "  -t, --traditional   use traditional greeting format\n"
-#~ "  -m, --mail          print your mail\n"
-#~ "\n"
-#~ "Report bugs to bug-gnu-hello@prep.ai.mit.edu.\n"
-#~ msgstr ""
-#~ "Isto � o GNU Hello, O programa de sauda��es.\n"
-#~ "\n"
-#~ "Utiliza��o:\n"
-#~ "\n"
-#~ "    %s [-htvm] [--help] [--version] [--traditional] [--mail]\n"
-#~ "\n"
-#~ "  -h, --help          mostrar esta ajuda e sair\n"
-#~ "  -v, --version       mostrar informa��o sobre a vers�o e sair\n"
-#~ "\n"
-#~ "  -t, --traditional   usar o formato de sauda��o tradicional\n"
-#~ "  -m, --mail          imprimir o teu correio\n"
+#: src/hello.c:294
+msgid "Hello, world!"
+msgstr "Ol�, mundo!"
+
+#: src/hello.c:309
+#, c-format
+msgid "%s: virtual memory exhausted\n"
+msgstr "%s: nao h� mais mem�ria virtual\n"
 
 #~ msgid "%s: unrecognized option, character code 0%o\n"
 #~ msgstr "%s: op��o desconhecida, c�digo caracter 0%o\n"


diff --git a/po/pt_BR.po b/po/pt_BR.po
line changes: +125/-207
index c0851c3..b4fe7c0
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,68 +7,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
-"PO-Revision-Date: 2002-10-29 21:15-0200\n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\n"
+"PO-Revision-Date: 2002-12-14 02:10-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenez@terra.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: op��o `%s' � amb�gua\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Tente `%s --help' para maiores informa��es.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: op��o `--%s' n�o permite um argumento\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "bom dia, mundo\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: op��o `%c%s' n�o permite um argumento\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+-----------------+\n"
-"| Bom dia, mundo! |\n"
-"+-----------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Bom dia, mundo!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op��o `--%s' n�o reconhecida\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: src/getopt.c:774
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op��o `%c%s' n�o reconhecida\n"
+
+#: src/getopt.c:800
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op��o ilegal -- %c\n"
+
+#: src/getopt.c:803
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op��o inv�lida -- %c\n"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op��o requer um argumento -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op��o `-W %s' � amb�gua\n"
+
+#: src/getopt.c:898
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op��o `-W %s' n�o permite um argumento\n"
+
+#: src/hello.c:164
+msgid "Too many arguments\n"
+msgstr "Argumentos demais\n"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Tente `%s --help' para maiores informa��es.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Uso: %s [OP��O]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, `O' programa de impress�o de sauda��o.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Uso: %s [OP��O]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -76,196 +102,88 @@ msgstr ""
 "  -h, --help          mostra esta ajuda e sai\n"
 "  -v, --version       mostra informa��es sobre a vers�o e sai\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
+#. TRANSLATORS: --help output 4 : options 2/2
 #. no-wrap
-#: src/hello.c:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       usa formato de sauda��o tradicional\n"
 "  -n, --next-generation   use formato de sauda��o de pr�xima gera��o\n"
 "  -m, --mail              mostra o seu correio eletr�nico\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"Reporte erros para <%s>.\n"
-"Reporte erros da tradu��o para <afmenez@terra.com.br>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:205
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Reporte erros para <%s>.\n"
 "Reporte erros da tradu��o para <afmenez@terra.com.br>.\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
-msgstr ""
-
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: op��o `%s' � amb�gua\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: op��o `--%s' n�o permite um argumento\n"
-
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: op��o `%c%s' n�o permite um argumento\n"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: op��o `%s' requer um argumento\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: op��o `--%s' n�o reconhecida\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: op��o `%c%s' n�o reconhecida\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: op��o inv�lida -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: op��o requer um argumento -- %c\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"
+"N�O existe qualquer garantia; nem mesmo a garantia de COMERCIABILIDADE ou\n"
+"ADEQUA��O � QUALQUER FINALIDADE PARTICULAR.  O GNU %s pode ser redistribu�do\n"
+"nos termos da Licensa Geral P�blica GNU.\n"
+"Para mais informa��o sobre esse assunto, veja o arquivo com nome COPYING.\n"
+
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: op��es incompat�veis: -m e -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: op��o `-W %s' � amb�gua\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Quem � voc�?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: op��o `-W %s' n�o permite um argumento\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: n�o foi poss�vel encontrar o seu arquivo de spool de correio eletr�nico.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op��o `%s' requer um argumento\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Nada acontece aqui."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "bom dia, mundo\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+-----------------+\n"
+"| Bom dia, mundo! |\n"
+"+-----------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Bom dia, mundo!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 msgstr "%s: Mem�ria virtual esgotada\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op��o ilegal -- %c\n"
-
-#~ msgid "Too many arguments\n"
-#~ msgstr "Argumentos demais\n"
-
-#~ msgid "GNU hello, THE greeting printing program.\n"
-#~ msgstr "GNU hello, `O' programa de impress�o de sauda��o.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
-#~ "under the terms 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�O existe qualquer garantia; nem mesmo a garantia de COMERCIABILIDADE "
-#~ "ou\n"
-#~ "ADEQUA��O � QUALQUER FINALIDADE PARTICULAR.  O GNU %s pode ser "
-#~ "redistribu�do\n"
-#~ "nos termos da Licensa Geral P�blica GNU.\n"
-#~ "Para mais informa��o sobre esse assunto, veja o arquivo com nome "
-#~ "COPYING.\n"
-
-#~ msgid "%s: Incompatible flags: -m and -t\n"
-#~ msgstr "%s: op��es incompat�veis: -m e -t\n"
-
-#~ msgid "%s: Who are you?\n"
-#~ msgstr "%s: Quem � voc�?\n"
-
-#~ msgid "%s: Cannot find your mail spool file.\n"
-#~ msgstr ""
-#~ "%s: n�o foi poss�vel encontrar o seu arquivo de spool de correio "
-#~ "eletr�nico.\n"
-
-#~ msgid "Nothing happens here."
-#~ msgstr "Nada acontece aqui."


diff --git a/po/ro.po b/po/ro.po
line changes: +123/-199
index db3c2bd..f8bb9e2
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,68 +6,94 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\n"
 "PO-Revision-Date: 2003-04-19 09:20+0300\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `--%s' nu permite un parametru\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "hello, world\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `%c%s' nu permite un parametru\n"
 
-#. TRANSLATORS: Use box drawing characters or other fancy stuff
-#. if your encoding (e.g., UTF-8) allows it.  If done so add the
-#. following note, please:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "Hello, world!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op�iune necunoscut� `--%s'\n"
+
+#: src/getopt.c:774
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op�iune necunoscut� `%c%s'\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: src/getopt.c:800
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op�iune ilegal� -- %c\n"
+
+#: src/getopt.c:803
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op�iune invalid� -- %c\n"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op�iunea necesit� un parametru -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+
+#: src/getopt.c:898
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `-W %s' nu permite un parametru\n"
+
+#: src/hello.c:164
+msgid "Too many arguments\n"
+msgstr "Prea mul�i parametri\n"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Folosire: %s [OP�IUNE]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, programul de tip�rire al saluturilor\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "Folosire: %s [OP�IUNE]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -75,189 +101,87 @@ msgstr ""
 "  -h, --help          afi�eaz� acest mesaj �i termin�\n"
 "  -v, --version       afi�eaz� informa�ii versiune �i termin�\n"
 
-#. TRANSLATORS: --help output 4: options 2/2
+#. TRANSLATORS: --help output 4 : options 2/2
 #. no-wrap
-#: src/hello.c:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       folose�te formatul tradi�ional de salut\n"
 "  -n, --next-generation   folose�te formatul salutului noii genera�ii\n"
 "  -m, --mail              tip�re�te mailul vostru\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Raporta�i bug-uri la >%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "Raporta�i bug-uri la >%s>.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "Raporta�i bug-uri la >%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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"
+"NU exist� nici o garan�ie; nici m�car pentru VANDABILITATE sau POTRIVIRE\n"
+"PENTRU UN SCOP ANUME.  Pute�i distribui copii ale GNU %s sub termenii\n"
+"Licen�ei Publice Generale GNU.\n"
+"Pentru mai multe informa�ii despre aceste chestiuni, citi�i fi�ierul numit\n"
+"COPYING.\n"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: op�iunea `%s' este ambigu�\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `--%s' nu permite un parametru\n"
-
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `%c%s' nu permite un parametru\n"
-
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un parametru\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: op�iune necunoscut� `--%s'\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: op�iune necunoscut� `%c%s'\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: op�iune invalid� -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: op�iunea necesit� un parametru -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: Marcaje(flags) incompatibile: -m �i -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: Cine e�ti tu?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `-W %s' nu permite un parametru\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: Nu pot g�si fi�ierul t�u de spool de mail\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un parametru\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "Nu se �nt�mpl� nimic aici."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "hello, world\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "Hello, world!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 msgstr "%s: Memorie virtual� plin�\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op�iune ilegal� -- %c\n"
-
-#~ msgid "Too many arguments\n"
-#~ msgstr "Prea mul�i parametri\n"
-
-#~ msgid "GNU hello, THE greeting printing program.\n"
-#~ msgstr "GNU hello, programul de tip�rire al saluturilor\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s\n"
-#~ "under the terms 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"
-#~ "NU exist� nici o garan�ie; nici m�car pentru VANDABILITATE sau POTRIVIRE\n"
-#~ "PENTRU UN SCOP ANUME.  Pute�i distribui copii ale GNU %s sub termenii\n"
-#~ "Licen�ei Publice Generale GNU.\n"
-#~ "Pentru mai multe informa�ii despre aceste chestiuni, citi�i fi�ierul "
-#~ "numit\n"
-#~ "COPYING.\n"
-
-#~ msgid "%s: Incompatible flags: -m and -t\n"
-#~ msgstr "%s: Marcaje(flags) incompatibile: -m �i -t\n"
-
-#~ msgid "%s: Who are you?\n"
-#~ msgstr "%s: Cine e�ti tu?\n"
-
-#~ msgid "%s: Cannot find your mail spool file.\n"
-#~ msgstr "%s: Nu pot g�si fi�ierul t�u de spool de mail\n"
-
-#~ msgid "Nothing happens here."
-#~ msgstr "Nu se �nt�mpl� nimic aici."


diff --git a/po/ru.po b/po/ru.po
line changes: +72/-98
index 33269da..0074e12
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,28 +4,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello 2.2\n"
+"Project-Id-Version: hello 2.1.96\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
-"PO-Revision-Date: 2007-02-13 07:07+0300\n"
+"POT-Creation-Date: 2006-11-13 16:45-0800\n"
+"PO-Revision-Date: 2007-02-13 06:51+0300\n"
 "Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/hello.c:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: ������ �������: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "���������� `%s --help' ��� ��������� ����� ���������� ��������.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "����������, ���\n"

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

@@ -47,26 +46,26 @@ msgstr ""
 "| ����������, ���! |\n"
 "+------------------+\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "����������, ���!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "�������������: %s [����]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "�������� �������������, ������������� �����������.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -86,145 +85,120 @@ msgstr ""
 "  -n, --next-generation   ������������ ������ ����������� ������ ���������\n"
 "  -g, --greeting=�����    ������������ ����� � �������� �����������\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "�� ������� ��������� �� ������ <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "�� ������� ��������� �� ������ <%s>.\n"
-
-#: src/hello.c:186
+#: src/hello.c:169
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "�� ������� ��������� �� ������ <%s>.\n"
 
-#: src/hello.c:188
+#: src/hello.c:187
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
-#, fuzzy, 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"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+"License: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
+"This is free software.  There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "��������: GNU GPL v2+ <http://www.gnu.org/licenses/gpl.html>\n"
 "��� ��������� ����������� �����������.  �� �� ������������� ��������, \n"
 "� ��������, ���������� �������.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "����������� ��������� ������"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ������������� ���� `%s'\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ���� `--%s' ������ �������������� ��� ���������\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ���� `%c%s' ������ �������������� ��� ���������\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ����������� ���� `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ����������� ���� `%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: �������� ���� -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: ���� %c ������ �� �������������� c ����������\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ������������� ���� `-W %s'\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ���� `-W %s' ������ �������������� ��� ���������\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: ���� `%s' ������ �������������� c ����������\n"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:245
 msgid "`"
 msgstr "\""
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:246
 msgid "'"
 msgstr "\""
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 msgid "memory exhausted"
 msgstr "������ ���������"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ������������ ���� -- %c\n"


diff --git a/po/sk.po b/po/sk.po
line changes: +32/-37
index 000a767..c28c545
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.6.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-22 11:48-0700\n"
 "PO-Revision-Date: 2011-03-24 06:35+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

@@ -118,80 +118,77 @@ msgstr "Domovská stránka %s: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Všeobecný návod na používanie softvéru GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Všeobecný návod na používanie softvéru GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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 ""
 "Autorské práva © %s Free Software Foundation, Inc.\n"
-"Licencia GPLv3+: GNU GPL verzia 3 alebo novšia <http://gnu.org/licenses/gpl."
-"html>\n"
+"Licencia GPLv3+: GNU GPL verzia 3 alebo novšia <http://gnu.org/licenses/gpl.html>\n"
 "Toto je slobodný softvér: môžete ho slobodne meniť a ďalej šíriť.\n"
 "Neposkytuje sa ŽIADNA ZÁRUKA v rozsahu povolenom zákonmi.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: voľba '%s' je nejasná\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba '--%s' nepovoľuje argument\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba '%c%s' nepovoľuje argument\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: voľba '--%s' vyžaduje argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznáma voľba '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznáma voľba '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje argument -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba '-W %s' je nejasná\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba '-W %s' nepovoľuje argument\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: voľba '-W %s' vyžaduje argument\n"

@@ -202,30 +199,28 @@ msgstr "chyba zápisu"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "„"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "“"
 


diff --git a/po/sl.po b/po/sl.po
line changes: +32/-38
index 4669755..d01a4ba
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-18 17:03+0100\n"
 "Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"

@@ -119,81 +119,77 @@ msgstr "Domača stran %s: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Splošna pomoč pri uporabi programske opreme GNU: <http://www.gnu.org/gethelp/"
-">\n"
+msgstr "Splošna pomoč pri uporabi programske opreme GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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 ""
 "Avtorske pravice (C) %s Free Software Foundation, Inc.\n"
-"Dovoljenje GPLv3+: GNU GPL različice 3 ali kasnejše <http://gnu.org/licenses/"
-"gpl.html>\n"
+"Dovoljenje GPLv3+: GNU GPL različice 3 ali kasnejše <http://gnu.org/licenses/gpl.html>\n"
 "To je prosta programska oprema; lahko jo spreminjate in/ali razširjate.\n"
 "Ta programska oprema NIMA GARANCIJE, do z zakonom dovoljene meje.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: možnost '%s' je dvoumna\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: možnost '--%s' ne dovoljuje argumenta\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: možnost '%c%s' ne dovoljuje argumenta\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: možnost '--%s' zahteva argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznana možnost '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznana možnost '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neveljavna možnost -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: možnost zahteva argument -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: možnost '-W %s' je dvoumna\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: možnost '-W %s' ne dovoljuje argumenta\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: možnost '-W %s' zahteva argument\n"

@@ -204,30 +200,28 @@ msgstr "napaka med pisanjem"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "\""
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "\""
 


diff --git a/po/sr.po b/po/sr.po
line changes: +32/-37
index 79c6c21..2c1888c
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2012-01-05 01:34+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"

@@ -17,8 +17,7 @@ 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%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/hello.c:100
 #, c-format

@@ -124,73 +123,71 @@ msgstr "Општа помоћ користећи ГНУ софтвер: <http://
 #, 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 ""
 "Ауторска права (C) %s Задужбина слободног софтвера, Инк.\n"
-"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније <http://gnu.org/licenses/gpl."
-"html>.\n"
+"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније <http://gnu.org/licenses/gpl.html>.\n"
 "Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
 "Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: опција „%s“ је нејасна\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опција „--%s“ захтева аргумент\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција —— „%c“\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент —— „%c“\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: опција „-W %s“ је нејасна\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: опција „-W %s“ захтева аргумент\n"

@@ -201,30 +198,28 @@ 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "„"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "“"
 


diff --git a/po/sv.po b/po/sv.po
line changes: +72/-102
index 591042c..d036198
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,26 +8,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.3.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2007-07-26 10:13-0700\n"
 "PO-Revision-Date: 2008-03-09 21:54+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
-"Language: sv\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:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: extra operand: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "hej, världen\n"

@@ -38,7 +37,7 @@ msgstr "hej, världen\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:113
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -51,26 +50,26 @@ msgstr ""
 "\n"
 "[Obs: Använd en lokal med UTF-8 för bästa visningsresultat.]\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "Hej, världen!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGA]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Skriv en vänlig, anpassningsbar hälsning.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -90,51 +89,28 @@ msgstr ""
 "  -n, --next-generation   använd nästa generations hälsningsformat\n"
 "  -g, --greeting=TEXT     använd TEXT som hälsningsmeddelande\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"Rapportera fel till <%s>.\n"
-"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:169
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Rapportera fel till <%s>.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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"
-"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl."
-"html>\n"
+"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl.html>\n"
 "\n"
 "(Följande text är en informell översättning som enbart tillhandahålls i\n"
 "informativt syfte. För alla juridiska tolkningar gäller den engelska\n"

@@ -144,106 +120,102 @@ msgstr ""
 "vidaredistribuera det. Det finns INGEN GARANTI, i den omfattning som\n"
 "medges av gällande lag.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:126
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tar inget argument\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: flaggan \"%s\" behöver ett argument\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: flaggan \"--%s\" är okänd\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: flaggan \"%c%s\" är okänd\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: flaggan behöver ett argument -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" behöver ett argument\n"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 msgid "write error"
 msgstr "skrivfel"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:229
 msgid "`"
 msgstr "”"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:230
 msgid "'"
 msgstr "”"
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 msgid "memory exhausted"
 msgstr "minne slut"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: otillåten flagga -- %c\n"
-
 #~ msgid "Too many arguments\n"
 #~ msgstr "För många argument\n"
 

@@ -253,14 +225,12 @@ msgstr "minne slut"
 #~ 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 ""
 #~ "Copyright © %s Free Software Fondation, Inc.\n"
-#~ "Det finns INGEN SOM HELST garanti; inte ens för SÄLJBARHET eller "
-#~ "LÄMPLIGHET\n"
+#~ "Det finns INGEN SOM HELST garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET\n"
 #~ "FÖR NÅGOT SPECIELLT ÄNDAMÅL. Du får lov att distribuera kopior av GNU %s\n"
 #~ "enligt villkoren i GNU General Public License.\n"
 #~ "För mer information om gällande regler, se filen COPYING.\n"


diff --git a/po/th.po b/po/th.po
line changes: +31/-35
index f3a356a..50f7acc
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU hello 2.6.90\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-22 11:48-0700\n"
 "PO-Revision-Date: 2011-03-24 03:34+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"

@@ -123,73 +123,71 @@ msgstr "ความช่วยเหลือทั่วไปในการ
 #, 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 ""
 "สงวนสิขสิทธิ์ (C) %s Free Software Foundation, Inc.\n"
-"สัญญาอนุญาต GPLv3: GNU GPL รุ่น 3 หรือใหม่กว่า <http://www.gnu.org/licenses/gpl."
-"html>\n"
+"สัญญาอนุญาต GPLv3: GNU GPL รุ่น 3 หรือใหม่กว่า <http://www.gnu.org/licenses/gpl.html>\n"
 "นี่เป็นซอฟต์แวร์เสรี: คุณมีอิสระในการปรับเปลี่ยนและการส่งต่อมัน.\n"
 "มีการไม่รับประกัน, จากขอบเขตที่อนุญาตโดยกฎหมาย.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "เกิดความผิดพลาดของระบบที่ไม่รู้จักขึ้น"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ตัวเลือก `%s' กำกวมไม่ชัดเจน\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ตัวเลือก '--%s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ตัวเลือก '%c%s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ตัวเลือก '--%s' จำเป็นต้องมีอาร์กิวเมนต์\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s:  ไม่สามารถจดจำตัวเลือก `--%s' \n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ไม่สามารถจดจำตัวเลือก '%c%s' ได้\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ตัวเลือกไม่ถูกต้อง -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ตัวเลือกที่ต้องการอาร์กิวเมนต์หนึ่งตัว -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ตัวเลือก '-W %s' กำกวมไม่ชัดเจน\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ตัวเลือก '-W %s' ไม่อนุญาตให้มีอาร์กิวเมนต์\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: ตัวเลือก '-W %s' จำเป็นต้องมีอาร์กิวเมนต์\n"

@@ -200,30 +198,28 @@ 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "'"
 


diff --git a/po/tr.po b/po/tr.po
line changes: +69/-96
index d405602..fe2fa27
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,28 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.3\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2007-06-26 15:18-0700\n"
 "PO-Revision-Date: 2007-07-09 11:16+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"Language: tr\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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/hello.c:100
+#: src/hello.c:95
 #, c-format
 msgid "%s: extra operand: %s\n"
 msgstr "%s: fazladan terim: %s\n"
 
-#: src/hello.c:102
+#: src/hello.c:97
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: src/hello.c:109
+#: src/hello.c:104
 #, c-format
 msgid "hello, world\n"
 msgstr "merhaba, dünya\n"

@@ -38,7 +37,7 @@ msgstr "merhaba, dünya\n"
 #.
 #. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#: src/hello.c:118
+#: src/hello.c:113
 #, c-format
 msgid ""
 "+---------------+\n"

@@ -54,26 +53,26 @@ msgstr ""
 "unicode_start\n"
 "ile deneyin.\n"
 
-#: src/hello.c:128
+#: src/hello.c:122
 msgid "Hello, world!"
 msgstr "Merhaba, dünya!"
 
 #. TRANSLATORS: --help output 1 (synopsis)
 #. no-wrap
-#: src/hello.c:150
+#: src/hello.c:140
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanımı: %s [SEÇENEK]...\n"
 
 #. TRANSLATORS: --help output 2 (brief description)
 #. no-wrap
-#: src/hello.c:155
+#: src/hello.c:145
 msgid "Print a friendly, customizable greeting.\n"
 msgstr "Dost canlısı, özelleştirilebilir bir karşılama iletisi basar.\n"
 
 #. TRANSLATORS: --help output 3: options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:151
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

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

@@ -93,45 +92,23 @@ msgstr ""
 "  -n, --next-generation   yeni nesil karşılama biçemi kullanılır\n"
 "  -g, --greeting=METİN    karşılama iletisi olarak METİN kullanılır\n"
 
-#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: --help output 5 (end)
 #. 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:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr ""
-"Lütfen, yazılım hatalarını <%s>,\n"
-"çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
+#: src/hello.c:169
+#, c-format
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 "Lütfen, yazılım hatalarını <%s>,\n"
 "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
 
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
-#, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-
-#: src/hello.c:209
+#: src/hello.c:187
 #, 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 ""

@@ -140,102 +117,98 @@ msgstr ""
 "Bu bir özgür yazılım olduğundan yasaların izin verdiği ölçüde\n"
 "herhangi bir garanti verilmemektedir.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:125
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' argümansız kullanılır\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tanınmayan seçenek `--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tanınmayan seçenek `%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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"
 msgstr "%s: seçenek bir argümanla kullanılır -- %c\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
-
-#: gnulib/lib/closeout.c:112
+#: gnulib/lib/closeout.c:74
 msgid "write error"
 msgstr "yazma hatası"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:229
 msgid "`"
 msgstr "`"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:230
 msgid "'"
 msgstr "'"
 
-#: gnulib/lib/xalloc-die.c:34
+#: gnulib/lib/xalloc-die.c:35
 msgid "memory exhausted"
 msgstr "bellek tükendi"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: kuraldışı seçenek -- %c\n"


diff --git a/po/uk.po b/po/uk.po
line changes: +120/-185
index 84e58eb..7e1ce61
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,73 +2,100 @@
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # This file is distributed under the same license as the hello package.
 # Igor Sachko <kick@tcs.com.ua>, 2004.
-#
-#
+# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.1.1\n"
-"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2002-05-22 19:23+0200\n"
 "PO-Revision-Date: 2004-03-17 12:01+0200\n"
 "Last-Translator: Igor Sachko <kick@tcs.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/hello.c:100
+#: src/getopt.c:693
 #, c-format
-msgid "%s: extra operand: %s\n"
-msgstr ""
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: �������� `%s' �������ͦ���\n"
 
-#: src/hello.c:102
+#: src/getopt.c:718
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "��������� `%s --help' ��� ������Φ�ϧ �������æ�.\n"
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: �������� `--%s' �� ������Ѥ �������Ԧ�\n"
 
-#: src/hello.c:109
+#: src/getopt.c:723
 #, c-format
-msgid "hello, world\n"
-msgstr "���צ�, �צ�\n"
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: �������� `%c%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:
-#.
-#. [Note: For best viewing results use a UTF-8 locale, please.]
-#.
-#: src/hello.c:118
+#: src/getopt.c:741 src/getopt.c:914
 #, c-format
-msgid ""
-"+---------------+\n"
-"| Hello, world! |\n"
-"+---------------+\n"
-msgstr ""
-"+---------------+\n"
-"| ���צ�, �צ�! |\n"
-"+---------------+\n"
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: �������� `%s' ������� �������Ԧ�\n"
 
-#: src/hello.c:128
-msgid "Hello, world!"
-msgstr "���צ� �צ�!"
+#: src/getopt.c:770
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ��צ����� �������� `--%s'\n"
+
+#: src/getopt.c:774
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ��צ����� �������� `%c%s'\n"
 
-#. TRANSLATORS: --help output 1 (synopsis)
+#: src/getopt.c:800
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ��צ���� �������� -- %c\n"
+
+#: src/getopt.c:803
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ��צ���� �������� -- %c\n"
+
+#: src/getopt.c:833 src/getopt.c:963
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: �������� ������� �������� -- %c\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: �������� `-W %s' �������ͦ���\n"
+
+#: src/getopt.c:898
+#, 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"
+
+#: src/hello.c:165
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "��������� `%s --help' ��� ������Φ�ϧ �������æ�.\n"
+
+#. TRANSLATORS: --help output 1
 #. no-wrap
-#: src/hello.c:150
-#, fuzzy, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "������������: %s [��������]\n"
+#: src/hello.c:177
+msgid "GNU hello, THE greeting printing program.\n"
+msgstr "GNU hello, �������� ��� ����� צ�����.\n"
 
-#. TRANSLATORS: --help output 2 (brief description)
+#. TRANSLATORS: --help output 2
 #. no-wrap
-#: src/hello.c:155
-msgid "Print a friendly, customizable greeting.\n"
-msgstr ""
+#: src/hello.c:182
+#, c-format
+msgid "Usage: %s [OPTION]\n"
+msgstr "������������: %s [��������]\n"
 
-#. TRANSLATORS: --help output 3: options 1/2
+#. TRANSLATORS: --help output 3 : options 1/2
 #. no-wrap
-#: src/hello.c:161
+#: src/hello.c:188
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit\n"

@@ -76,173 +103,81 @@ 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:168
-#, fuzzy
+#: src/hello.c:195
 msgid ""
 "  -t, --traditional       use traditional greeting format\n"
 "  -n, --next-generation   use next-generation greeting format\n"
-"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+"  -m, --mail              print your mail\n"
 msgstr ""
 "  -t, --traditional       ��������������� �����æ���� ������ צ�����\n"
 "  -n, --next-generation   ��������������� ����� ������ צ�����\n"
 "  -m, --mail              �������� ���� �����\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.
+#. TRANSLATORS: --help output 5 (end)
+#. TRANSLATORS, please don't forget to add the contact address for
+#. your translation!
 #. no-wrap
-#: src/hello.c:179
-#, fuzzy, c-format
-msgid "Report bugs to: %s\n"
-msgstr "��� ������� �צ����� �� <%s>.\n"
-
-#: src/hello.c:182
-#, fuzzy, c-format
-msgid "Report %s bugs to: %s\n"
-msgstr "��� ������� �צ����� �� <%s>.\n"
-
-#: src/hello.c:186
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr ""
-
-#: src/hello.c:188
+#: src/hello.c:205
 #, c-format
-msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-msgstr ""
-
-#: src/hello.c:191
-msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
+msgid "Report bugs to <%s>.\n"
+msgstr "��� ������� �צ����� �� <%s>.\n"
 
-#: src/hello.c:209
+#: src/hello.c:217
 #, 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"
-"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 ""
-
-#: gnulib/lib/error.c:188
-msgid "Unknown system error"
+"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 ""
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: �������� `%s' �������ͦ���\n"
-
-#: gnulib/lib/getopt.c:624 gnulib/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:637 gnulib/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:685 gnulib/lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: �������� `%s' ������� �������Ԧ�\n"
-
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ��צ����� �������� `--%s'\n"
-
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ��צ����� �������� `%c%s'\n"
-
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ��צ���� �������� -- %c\n"
-
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: �������� ������� �������� -- %c\n"
+#: src/hello.c:228
+#, c-format
+msgid "%s: Incompatible flags: -m and -t\n"
+msgstr "%s: ����ͦ�Φ ���������: -m �� -t\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: �������� `-W %s' �������ͦ���\n"
+#: src/hello.c:260
+#, c-format
+msgid "%s: Who are you?\n"
+msgstr "%s: ��� ��?\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: �������� `-W %s' �� ������Ѥ �������Ԧ�\n"
+#: src/hello.c:282
+#, c-format
+msgid "%s: Cannot find your mail spool file.\n"
+msgstr "%s: ��������� ������ ���� � ����� ������.\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: �������� `%s' ������� �������Ԧ�\n"
+#: src/hello.c:326
+msgid "Nothing happens here."
+msgstr "��� Φ���� �� צ����������."
 
-#: gnulib/lib/closeout.c:112
-msgid "write error"
-msgstr ""
+#: src/hello.c:332
+msgid "hello, world\n"
+msgstr "���צ�, �צ�\n"
 
-#. 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.
+#. 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:
 #.
-#. 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.
+#. [Note: For best viewing results use a UTF-8 locale, please.]
 #.
-#. 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.
-#: gnulib/lib/quotearg.c:312
-msgid "`"
+#: src/hello.c:340
+msgid ""
+"+---------------+\n"
+"| Hello, world! |\n"
+"+---------------+\n"
 msgstr ""
+"+---------------+\n"
+"| ���צ�, �צ�! |\n"
+"+---------------+\n"
 
-#: gnulib/lib/quotearg.c:313
-msgid "'"
-msgstr ""
+#: src/hello.c:346
+msgid "Hello, world!"
+msgstr "���צ� �צ�!"
 
-#: gnulib/lib/xalloc-die.c:34
-#, fuzzy
-msgid "memory exhausted"
+#: src/hello.c:361
+#, c-format
+msgid "%s: Virtual memory exhausted\n"
 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 "%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/vi.po b/po/vi.po
line changes: +31/-35
index ca08f70..dea16d3
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2012-03-01 14:44+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"

@@ -120,15 +120,13 @@ msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n"
 
 #: src/hello.c:191
 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-msgstr ""
-"Trợ giúp chung về sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n"
+msgstr "Trợ giúp chung về sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n"
 
 #: src/hello.c:209
 #, 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 ""

@@ -138,62 +136,62 @@ msgstr ""
 "Đây là phần mềm tự do : bạn có quyền sửa đổi và phát hành lại nó.\n"
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều khiển được pháp luật cho phép.\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tùy chọn '%s' vẫn mơ hồ\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn `--%s' không cho phép đối số\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn '%c%s' không cho phép đối số\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tùy chọn '--%s' yêu cầu một đối số\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: không nhận ra tùy chọn '--%s'\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn '%c%s'\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: tùy chọn không hợp lệ -- '%c'\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tùy chọn yêu cầu một đối số -- '%c'\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn '-W %s' vẫn mơ hồ\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn '-W %s' không cho phép đối số\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tùy chọn '-W %s' yêu cầu một đối số\n"

@@ -204,30 +202,28 @@ msgstr "lỗi ghi"
 
 #. 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,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "'"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "'"
 


diff --git a/po/zh_CN.po b/po/zh_CN.po
line changes: +32/-37
index 628f1a1..3d88dae
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2011-04-28 20:23+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"

@@ -138,73 +138,71 @@ msgstr "使用GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
 #, 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:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: 选项\"%s\"有歧义\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: 选项\"--%s\"不要参数\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: 选项\"%c%s\"不要参数\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: 选项\"--%s\" 必须带参数。\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 无法识别的选项\"--%s\"\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 无法识别的选项\"%c%s\"\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 选项无效 -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 选项必须带参数 -- \"%c\"\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: 选项\"-W %s\"有歧义\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: 选项\"-W %s\"不要参数\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: 选项\"-W %s\" 必须带参数。\n"

@@ -215,30 +213,28 @@ 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "‘"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "’"
 

@@ -260,8 +256,7 @@ msgstr "虚拟内存已耗尽"
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n"
-#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the "
-#~ "terms\n"
+#~ "PARTICULAR PURPOSE.  You may redistribute copies of GNU %s under the terms\n"
 #~ "of the GNU General Public License.\n"
 #~ "For more information about these matters, see the file named COPYING.\n"
 #~ msgstr ""


diff --git a/po/zh_TW.po b/po/zh_TW.po
line changes: +30/-33
index 1c84b92..14e9647
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello 2.7\n"
 "Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
-"POT-Creation-Date: 2012-04-14 15:06+0100\n"
+"POT-Creation-Date: 2011-03-28 07:00-0700\n"
 "PO-Revision-Date: 2012-04-11 23:03+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"

@@ -121,8 +121,7 @@ msgstr "使用 GNU 軟體的一般說明：<http://www.gnu.org/gethelp/>\n"
 #, 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 ""

@@ -131,62 +130,62 @@ msgstr ""
 "此為自由軟體：您可以自由變更和再次散布它。\n"
 "在法律所允許的範圍內，不做任何擔保。\n"
 
-#: gnulib/lib/error.c:188
+#: gnulib/lib/error.c:181
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib/lib/getopt.c:547 gnulib/lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib/lib/getopt.c:527 gnulib/lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：選項「%s」為模稜兩可的\n"
 
-#: gnulib/lib/getopt.c:624 gnulib/lib/getopt.c:628
+#: gnulib/lib/getopt.c:576 gnulib/lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：選項「--%s」不允許使用引數\n"
 
-#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:642
+#: gnulib/lib/getopt.c:589 gnulib/lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：選項「%c%s」不允許使用引數\n"
 
-#: gnulib/lib/getopt.c:685 gnulib/lib/getopt.c:704
+#: gnulib/lib/getopt.c:637 gnulib/lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：選項「--%s」需要一個引數\n"
 
-#: gnulib/lib/getopt.c:742 gnulib/lib/getopt.c:745
+#: gnulib/lib/getopt.c:694 gnulib/lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法辨識的選項「--%s」\n"
 
-#: gnulib/lib/getopt.c:753 gnulib/lib/getopt.c:756
+#: gnulib/lib/getopt.c:705 gnulib/lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法辨識的選項「%c%s」\n"
 
-#: gnulib/lib/getopt.c:805 gnulib/lib/getopt.c:808
+#: gnulib/lib/getopt.c:757 gnulib/lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：無效的選項 -- 「%c」\n"
 
-#: gnulib/lib/getopt.c:861 gnulib/lib/getopt.c:878 gnulib/lib/getopt.c:1088
-#: gnulib/lib/getopt.c:1106
+#: gnulib/lib/getopt.c:810 gnulib/lib/getopt.c:827 gnulib/lib/getopt.c:1035
+#: gnulib/lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要一個引數 -- 「%c」\n"
 
-#: gnulib/lib/getopt.c:934 gnulib/lib/getopt.c:950
+#: gnulib/lib/getopt.c:883 gnulib/lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項「-W %s」為模稜兩可的\n"
 
-#: gnulib/lib/getopt.c:974 gnulib/lib/getopt.c:992
+#: gnulib/lib/getopt.c:923 gnulib/lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：選項「-W %s」不允許使用引數\n"
 
-#: gnulib/lib/getopt.c:1013 gnulib/lib/getopt.c:1031
+#: gnulib/lib/getopt.c:962 gnulib/lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：選項「-W %s」需要一個引數\n"

@@ -197,30 +196,28 @@ 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.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. 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.
+#. 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 you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib/lib/quotearg.c:312
+#: gnulib/lib/quotearg.c:271
 msgid "`"
 msgstr "「"
 
-#: gnulib/lib/quotearg.c:313
+#: gnulib/lib/quotearg.c:272
 msgid "'"
 msgstr "」"

Generated by Itsy-Gitsy on Sun Apr 12 23:57:26 2026 +0000
This website is licensed under AGPL-3.0. Feel free to copy!