Regenerated for 0.18.

diff --git a/gettext-runtime/po/be.po b/gettext-runtime/po/be.po
index e1a2277abcf3cad691620ab49b30261e490f24ab..f01b3dd86697a4ede6d45447c0853696b22e9dfa 100644 (file)
--- a/gettext-runtime/po/be.po
+++ b/gettext-runtime/po/be.po
@@ -6,81 +6,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
+"Language: be\n"
 "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"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: несапраўдны выбар -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -304,6 +304,9 @@ msgstr ""
 "асяроддзя TEXTDOMAINDIR.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: несапраўдны выбар -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -986,13 +989,13 @@ msgstr ""
 #~ msgid ""
 #~ "A special builtin command called '0' outputs the translation, followed by "
 #~ "a\n"
-#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -"
-#~ "0\".\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
 #~ msgstr ""
 #~ "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт "
 #~ "за ім.\n"
-#~ "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0"
-#~ "\".\n"
+#~ "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs "
+#~ "-0\".\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
@@ -1271,8 +1274,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "      --no-hash               binary file will not include the hash "
 #~ "table\n"
 #~ msgstr ""
@@ -1300,8 +1303,8 @@ msgstr ""
 #~ msgid ""
 #~ "nplurals = %lu but plural expression can produce values as large as %lu"
 #~ msgstr ""
-#~ "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %"
-#~ "lu"
+#~ "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як "
+#~ "%lu"
 
 #~ msgid "plural expression can produce division by zero"
 #~ msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"

diff --git a/gettext-runtime/po/bg.po b/gettext-runtime/po/bg.po
index 9ffe0c0ce23358759933daba307e03ec73a8ced3..c3ac42aaffafcf0459976a68d096ce272f6baad3 100644 (file)
--- a/gettext-runtime/po/bg.po
+++ b/gettext-runtime/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-26 15:18+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2010-01-28 23:49+0200\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -20,62 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Неизвестна системна грешка"
 
-#: gnulib-lib/getopt.c:529 gnulib-lib/getopt.c:545
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: опцията '%s' е двусмислена\n"
 
-#: gnulib-lib/getopt.c:578 gnulib-lib/getopt.c:582
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опцията '--%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:591 gnulib-lib/getopt.c:596
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:639 gnulib-lib/getopt.c:658 gnulib-lib/getopt.c:961
-#: gnulib-lib/getopt.c:980
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
-msgid "%s: option '%s' requires an argument\n"
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опцията `%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:696 gnulib-lib/getopt.c:699
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: неразпозната опция '--%s'\n"
 
-#: gnulib-lib/getopt.c:707 gnulib-lib/getopt.c:710
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: неразпозната опция '%c%s'\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилен опция -- %c\n"
 
-#: gnulib-lib/getopt.c:812 gnulib-lib/getopt.c:829 gnulib-lib/getopt.c:1032
-#: gnulib-lib/getopt.c:1050
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:882 gnulib-lib/getopt.c:898
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: опцията '-W %s' е двусмислена\n"
 
-#: gnulib-lib/getopt.c:922 gnulib-lib/getopt.c:940
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опцията '-W %s' е без аргумент\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опцията `%s' изисква аргумент\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"

diff --git a/gettext-runtime/po/ca.po b/gettext-runtime/po/ca.po
index df6c4618e11a4f526297769d137a342e0c3434be..185e627400be20f21489f405c402b3aa171d6a25 100644 (file)
--- a/gettext-runtime/po/ca.po
+++ b/gettext-runtime/po/ca.po
@@ -50,10 +50,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,67 +65,66 @@ msgid "write error"
 msgstr "error d’escriptura"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l’opció «%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: l’opció «--%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: l’opció «%c%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: no es permet l’opció «%c»\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l’opció «-W %s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -363,3 +363,6 @@ msgstr ""
 "troba al directori habitual, es pot especificar una altra ubicació amb la\n"
 "variable d’entorn TEXTDOMAINDIR.\n"
 "Directori estàndard de cerca: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: no es permet l’opció «%c»\n"

diff --git a/gettext-runtime/po/cs.po b/gettext-runtime/po/cs.po
index f4b62d8b0d608b2a1a55f8e762f820b0b415cc1b..5df2346608f7a08729d2e4e10ee0514841225b42 100644 (file)
--- a/gettext-runtime/po/cs.po
+++ b/gettext-runtime/po/cs.po
@@ -13,93 +13,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\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"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr ""
 
 # lib/error.c:91
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznámá systémová chyba"
 
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
 # lib/getopt.c:707
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznámý pøepínaè `%c%s'\n"
 
-# lib/getopt.c:733
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
-
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
 # lib/getopt.c:766 lib/getopt.c:896
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
 
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
 
 # lib/getopt.c:831
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
 
+# lib/getopt.c:674 lib/getopt.c:847
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
+
 # lib/xmalloc.c:82
 #: gnulib-lib/xmalloc.c:37
 #, c-format
@@ -343,6 +343,10 @@ msgstr ""
 "v promìnné prostøedí TEXTDOMAINDIR.\n"
 "  Adresáø, ve kterém se hledá: %s\n"
 
+# lib/getopt.c:733
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neznámý pøepínaè -- %c\n"
+
 # src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
 # src/msgunfmt.c:175 src/xgettext.c:394
 #~ msgid ""
@@ -1614,8 +1618,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -1640,8 +1644,8 @@ msgstr ""
 #~ "odpovídající\n"
 #~ "krátké formy.\n"
 #~ "\n"
-#~ "  -a, --alignment=ÈÍSLO    zarovná øetìzce do ÈÍSLO bajtù (implicitnì: %"
-#~ "d)\n"
+#~ "  -a, --alignment=ÈÍSLO    zarovná øetìzce do ÈÍSLO bajtù (implicitnì: "
+#~ "%d)\n"
 #~ "  -c, --check              vykoná jazykovì závislé kontroly øetìzcù\n"
 #~ "  -D, --directory=ADRESÁØ  pøidá ADRESÁØ do seznamu adresáøù pro hledání\n"
 #~ "                           vstupních souborù\n"

diff --git a/gettext-runtime/po/da.po b/gettext-runtime/po/da.po
index b70e4e856a094098d67ddd99b8955cf8edafe0d6..014bd16a985772eef0546147f26feaa21daf57c1 100644 (file)
--- a/gettext-runtime/po/da.po
+++ b/gettext-runtime/po/da.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2002-09-07 19:32+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -22,67 +23,66 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tilvalget `%s' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovligt tilvalg -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget '%c' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tilvalget `%s' kræver et argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -305,6 +305,9 @@ msgstr ""
 "TEXTDOMAINDIR.\n"
 "Standard-filkataloget for søgning er: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovligt tilvalg -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -984,8 +987,8 @@ msgstr ""
 #~ msgid ""
 #~ "A special builtin command called '0' outputs the translation, followed by "
 #~ "a\n"
-#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -"
-#~ "0\".\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
 #~ msgstr ""
 #~ "En speciel indbygget kommando som heder \"0\" skriver ud beskeden fulgt\n"
 #~ "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n"
@@ -1243,8 +1246,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "      --no-hash               binary file will not include the hash "
 #~ "table\n"
 #~ msgstr ""
@@ -1849,8 +1852,8 @@ msgstr ""
 #~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 #~ "obsolete %ld.\n"
 #~ msgstr ""
-#~ "%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %"
-#~ "ld, forældede %ld.\n"
+#~ "%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
+#~ "%ld, forældede %ld.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " afsluttet.\n"

diff --git a/gettext-runtime/po/de.po b/gettext-runtime/po/de.po
index d7b72d936b633986fa30743a5244998eb761d9b1..b51e54d24f30e62134b00ffb1f4680a90971505a 100644 (file)
--- a/gettext-runtime/po/de.po
+++ b/gettext-runtime/po/de.po
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-07-19 22:52+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-07-24 10:30+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -91,67 +91,66 @@ msgstr ""
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/error.c:127
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erwartet kein 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"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein 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"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzulässige Option -- %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- %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"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Option »%s« erwartet ein Argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -397,3 +396,6 @@ msgstr ""
 "Umgebungsvariable TEXTDOMAINDIR ein anderes Verzeichnis angegeben werden.\n"
 "\n"
 "Standardverzeichnis: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: unzulässige Option -- %c\n"

diff --git a/gettext-runtime/po/el.po b/gettext-runtime/po/el.po
index f22108f51930e78750feb8e2128734cccd20f929..5539f04f755119d86746e2e5023418e2a95959bb 100644 (file)
--- a/gettext-runtime/po/el.po
+++ b/gettext-runtime/po/el.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,78 +21,77 @@ msgid "write error"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
 
 #
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n"
 
 #
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
-
-#
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ç åðéëïãÞ áðáéôåß ðáñÜìåôñï -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
+#
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
+
 #
 #: gnulib-lib/xmalloc.c:37
 #, fuzzy, c-format
@@ -328,6 +328,10 @@ msgstr ""
 "Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n"
 "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
 
+#
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
+
 #
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -1566,8 +1570,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-runtime/po/eo.po b/gettext-runtime/po/eo.po
index b41fa634f8dedb359eb04b29e4e56bd56da218ca..5b76fe3363c9b70c8d3e0c81e223ce4875589a22 100644 (file)
--- a/gettext-runtime/po/eo.po
+++ b/gettext-runtime/po/eo.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-16 10:18+0100\n"
 "Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "skriberaro"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nekonata sistemeraro"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: la opcio '%s' estas dubasenca\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: la opcio '--%s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: la opcio '%c%s' ne prenas argumenton\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: la opcio '%s' bezonas argumenton\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nerekonata opcio '--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nerekonata opcio '%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nepermesata opcio -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: nevalida opcio -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcio bezonas argumenton -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: la opcio '-W %s' estas dubasenca\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: la opcio '-W %s' ne prenas argumenton\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: la opcio '%s' bezonas argumenton\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -312,6 +312,9 @@ msgstr ""
 "alia dosierujo povas esti specifita per la media variablo TEXTDOMAINDIR.\n"
 "Normala serĉdosierujo: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nepermesata opcio -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/es.po b/gettext-runtime/po/es.po
index dfedce97b84522c60c475cbdf1c663d7a37f8e31..48fb90d1c285a0dd64b2d4ee1d91fb2f5350b8f3 100644 (file)
--- a/gettext-runtime/po/es.po
+++ b/gettext-runtime/po/es.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2005-06-22 19:36-0600\n"
 "Last-Translator: Max de Mendizábal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,69 +22,66 @@ msgstr "error de escritura"
 
 # Nota: El error es del sistema, pero no se sabe cuál es el error,
 # por eso es (además) desconocido.
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Hay un error del sistema desconocido"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opción no reconocida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opción no reconocida `%c%s'\n"
 
-# acepto la sugerencia de em en cuanto a que inválida parece cárcel
-# o inútil pero mejor puse inválida
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción inválida -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la opción requiere un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: la opción `-W %s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: la opción `%s' requiere un argumento\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -351,6 +349,11 @@ msgstr ""
 "puede especificar otro lugar.\n"
 "Directorio de búsqueda estándar: %s\n"
 
+# acepto la sugerencia de em en cuanto a que inválida parece cárcel
+# o inútil pero mejor puse inválida
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción inválida -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/et.po b/gettext-runtime/po/et.po
index 907778709886d50897878bf20455865ea87ef9af..eb0cc41a15c578ff16f12fe08d8e748c9d1a5b7e 100644 (file)
--- a/gettext-runtime/po/et.po
+++ b/gettext-runtime/po/et.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,67 +19,66 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemne viga"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: võti `%s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `--%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: võtme `%s' järel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu võti `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu võti `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: lubamatu võti -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane võti -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: võtme järel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: võti `-W %s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: võtme `%s' järel peab olema argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -308,6 +308,9 @@ msgstr ""
 "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n"
 "Standardne otsinukataloog: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: lubamatu võti -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1086,8 +1089,8 @@ msgstr ""
 #~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 #~ "obsolete %ld.\n"
 #~ msgstr ""
-#~ "%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %"
-#~ "ld, vananenuid %ld.\n"
+#~ "%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid "
+#~ "%ld, vananenuid %ld.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " valmis.\n"
@@ -1453,8 +1456,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-runtime/po/fi.po b/gettext-runtime/po/fi.po
index 4e593a19a7f57c97ddca909266f5e56648d5afd9..2ded3e48f6b61b484ed782d865e5f00385380d71 100644 (file)
--- a/gettext-runtime/po/fi.po
+++ b/gettext-runtime/po/fi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-21 00:28+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@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"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "virhe kirjoitettaessa"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: valitsin ”%s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tuntematon valitsin ”--%s”\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: virheellinen valitsin -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin vaatii argumentin -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -319,3 +319,6 @@ msgstr ""
 "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
 "jalla TEXTDOMAINDIR.\n"
 "Perushakemisto, josta haku suoritetaan: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: virheellinen valitsin -- %c\n"

diff --git a/gettext-runtime/po/fr.po b/gettext-runtime/po/fr.po
index d99ec41f3fe8b057f8ccb45da81af5b155eb00a1..f6ad695960c1183fe87535b80caa925fac7f28ca 100644 (file)
--- a/gettext-runtime/po/fr.po
+++ b/gettext-runtime/po/fr.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-27 13:43+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,67 +24,66 @@ msgstr ""
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s : l'option « %s » exige un argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s : l'option « --%c » n'est pas permise\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : l'option « --%c » n'est pas valide\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option « --%c » exige un argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s : l'option « %s » exige un argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -316,6 +316,9 @@ msgstr ""
 "dossier.\n"
 "Répertoire standard de recherche : %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s : l'option « --%c » n'est pas permise\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -383,8 +386,8 @@ msgstr ""
 #~ msgid ""
 #~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
 #~ msgstr ""
-#~ "spécifications de format entre « msgid » et « %s » de l'argument %u ne "
-#~ "sont pas identiques"
+#~ "spécifications de format entre « msgid » et « %s » de l'argument %u "
+#~ "ne sont pas identiques"
 
 #~ msgid ""
 #~ "a format specification for argument %u, as in '%s', doesn't exist in "
@@ -394,14 +397,15 @@ msgstr ""
 #~ "n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument %u doesn't exist in '%s'"
-#~ msgstr "spécification de format de l'argument %u n'existe pas dans « %s »"
+#~ msgstr ""
+#~ "spécification de format de l'argument %u n'existe pas dans « %s »"
 
 #~ msgid ""
 #~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
 #~ "'msgid'"
 #~ msgstr ""
-#~ "spécification de format de l'argument {%u}, comme dans « %s », n'existe "
-#~ "pas dans « msgid »"
+#~ "spécification de format de l'argument {%u}, comme dans « %s », "
+#~ "n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
 #~ msgstr ""
@@ -411,8 +415,8 @@ msgstr ""
 #~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
 #~ "same"
 #~ msgstr ""
-#~ "spécifications de format de « msgid » et « %s » de l'argument {%u} ne "
-#~ "sont pas les mêmes"
+#~ "spécifications de format de « msgid » et « %s » de l'argument {%u} "
+#~ "ne sont pas les mêmes"
 
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
 #~ msgstr ""
@@ -428,15 +432,15 @@ msgstr ""
 #~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
 #~ "tuple"
 #~ msgstr ""
-#~ "spécifications de format de « msgid » requièrent un mapping, celles de "
-#~ "« %s » requièrent un tuple"
+#~ "spécifications de format de « msgid » requièrent un mapping, celles "
+#~ "de « %s » requièrent un tuple"
 
 #~ msgid ""
 #~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
 #~ "mapping"
 #~ msgstr ""
-#~ "spécifications de format de « msgid » requièrent un tuple, celles de « "
-#~ "%s » requièrent un mapping"
+#~ "spécifications de format de « msgid » requièrent un tuple, celles de "
+#~ "« %s » requièrent un mapping"
 
 #~ msgid ""
 #~ "a format specification for argument '%s', as in '%s', doesn't exist in "
@@ -446,14 +450,15 @@ msgstr ""
 #~ "n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
-#~ msgstr "spécification de format de l'argument « %s » n'existe pas « %s »"
+#~ msgstr ""
+#~ "spécification de format de l'argument « %s » n'existe pas « %s »"
 
 #~ msgid ""
 #~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
 #~ "same"
 #~ msgstr ""
-#~ "spécifications de format de « msgid » et de « %s » de l'argument « %s "
-#~ "» ne sont pas les mêmes"
+#~ "spécifications de format de « msgid » et de « %s » de l'argument « "
+#~ "%s » ne sont pas les mêmes"
 
 #~ msgid "Usage: %s [OPTION]\n"
 #~ msgstr "Usage: %s [OPTION]\n"
@@ -546,7 +551,8 @@ msgstr ""
 #~ "      --untranslated          conserver les non traduits, enlever ceux "
 #~ "traduits\n"
 #~ "      --no-fuzzy              enlever les messages marqués « fuzzy »\n"
-#~ "      --only-fuzzy            conserver les messages marqués « fuzzy »\n"
+#~ "      --only-fuzzy            conserver les messages marqués « fuzzy "
+#~ "»\n"
 #~ "      --no-obsolete           enlever les messages obsolètes #~\n"
 #~ "      --only-obsolete         conserver les messages obsolètes #~\n"
 
@@ -561,9 +567,10 @@ msgstr ""
 #~ "obsolete\n"
 #~ msgstr ""
 #~ "Manipulation des attributs:\n"
-#~ "      --set-fuzzy             marquer tous les messages comme « fuzzy »\n"
-#~ "      --clear-fuzzy           marquer tous les messages comme non-« fuzzy "
+#~ "      --set-fuzzy             marquer tous les messages comme « fuzzy "
 #~ "»\n"
+#~ "      --clear-fuzzy           marquer tous les messages comme non-« "
+#~ "fuzzy »\n"
 #~ "      --set-obsolete          marquer tous les messages comme obsolètes\n"
 #~ "      --clear-obsolete        marquer tous les messages comme non-"
 #~ "obsolètes\n"
@@ -598,8 +605,8 @@ msgstr ""
 #~ "  -i, --indent                sortie en style indenté\n"
 #~ "      --no-location           ne pas produire les lignes « #: fichier:"
 #~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: fichier:"
-#~ "ligne » (par défaut)\n"
+#~ "  -n, --add-location          générer les lignes de format « #: "
+#~ "fichier:ligne » (par défaut)\n"
 #~ "      --strict                générer un fichier .po avec conformité "
 #~ "stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
@@ -685,7 +692,8 @@ msgstr ""
 #~ "fois\n"
 #~ "                                 (sans limite par défaut i.e. = à "
 #~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 "
+#~ "»\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -727,8 +735,8 @@ msgstr ""
 #~ "  -i, --indent                sortie en style indenté\n"
 #~ "      --no-location           ne pas produire les lignes « #: fichier:"
 #~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: fichier:"
-#~ "ligne » (par défaut)\n"
+#~ "  -n, --add-location          générer les lignes de format « #: "
+#~ "fichier:ligne » (par défaut)\n"
 #~ "      --strict                générer un fichier .po avec conformité "
 #~ "stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
@@ -767,8 +775,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Comparer deux fichiers .po style Uniforum et vérifier qu'ils "
 #~ "contiennent\n"
-#~ "le même ensemble de chaînes « msgid ».  Le fichier def.po contient les "
-#~ "vieilles\n"
+#~ "le même ensemble de chaînes « msgid ».  Le fichier def.po contient "
+#~ "les vieilles\n"
 #~ "traductions.  Le fichier ref.pot est le dernier fichier PO récemment "
 #~ "créé ou un \n"
 #~ "fichier patron PO (souvent créé par xgettext).\n"
@@ -864,7 +872,8 @@ msgstr ""
 #~ "fois\n"
 #~ "                                 (sans limite par défaut i.e. = à "
 #~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 "
+#~ "»\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -898,15 +907,16 @@ msgstr ""
 #~ "  -i, --indent                sortie en style indenté\n"
 #~ "      --no-location           ne pas produire les lignes « #: fichier:"
 #~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: fichier:"
-#~ "ligne » (par défaut)\n"
+#~ "  -n, --add-location          générer les lignes de format « #: "
+#~ "fichier:ligne » (par défaut)\n"
 #~ "      --strict                générer un fichier .po avec conformité "
 #~ "stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
 #~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
 #~ "fichiers\n"
-#~ "      --omit-header           omettre les en-têtes pour « msgid \"\" »\n"
+#~ "      --omit-header           omettre les en-têtes pour « msgid \"\" "
+#~ "»\n"
 
 #~ msgid "Converts a translation catalog to a different character encoding.\n"
 #~ msgstr ""
@@ -1019,8 +1029,8 @@ msgstr ""
 #~ msgid ""
 #~ "A special builtin command called '0' outputs the translation, followed by "
 #~ "a\n"
-#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -"
-#~ "0\".\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
 #~ msgstr ""
 #~ "Une commande spéciale interne appelée sorties « 0 » de traduction, "
 #~ "suivi par un\n"
@@ -1302,8 +1312,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "      --no-hash               binary file will not include the hash "
 #~ "table\n"
 #~ msgstr ""
@@ -1354,7 +1364,8 @@ msgstr ""
 #~ "le catalogue de messages contient des formes de traduction au pluriel..."
 
 #~ msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-#~ msgstr "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête"
+#~ msgstr ""
+#~ "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête"
 
 #~ msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 #~ msgstr "...mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
@@ -1393,11 +1404,13 @@ msgstr ""
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 #~ msgstr ""
-#~ "les chaînes « msgid » et « msgid_plural » ne débutent pas par « \\n »"
+#~ "les chaînes « msgid » et « msgid_plural » ne débutent pas par « "
+#~ "\\n »"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 #~ msgstr ""
-#~ "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n »"
+#~ "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n "
+#~ "»"
 
 #~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 #~ msgstr ""
@@ -1410,8 +1423,8 @@ msgstr ""
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 #~ msgstr ""
-#~ "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « \\n "
-#~ "»"
+#~ "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « "
+#~ "\\n »"
 
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 #~ msgstr ""
@@ -1424,8 +1437,8 @@ msgstr ""
 
 #~ msgid "'%s' is not a valid %s format string, unlike 'msgid'"
 #~ msgstr ""
-#~ "« %s » n'a pas une chaîne de format %s valide, contrairement à « msgid "
-#~ "»"
+#~ "« %s » n'a pas une chaîne de format %s valide, contrairement à « "
+#~ "msgid »"
 
 #~ msgid "msgstr lacks the keyboard accelerator mark '%c'"
 #~ msgstr "« msgstr » n'a pas de raccourci clavier pour la marque « %c »"
@@ -1437,7 +1450,8 @@ msgstr ""
 #~ msgstr "Le champ en-tête « %s » est absent de l'en-tête\n"
 
 #~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n"
+#~ msgstr ""
+#~ "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n"
 
 #~ msgid "some header fields still have the initial default value\n"
 #~ msgstr ""
@@ -1746,8 +1760,8 @@ msgstr ""
 #~ "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 #~ "charset specification"
 #~ msgstr ""
-#~ "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas d'en-"
-#~ "tête avec la spécification d'un charset"
+#~ "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas "
+#~ "d'en-tête avec la spécification d'un charset"
 
 #~ msgid "target charset \"%s\" is not a portable encoding name."
 #~ msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable."
@@ -1769,8 +1783,8 @@ msgstr ""
 #~ "Converting the output to UTF-8.\n"
 #~ "To select a different output encoding, use the --to-code option.\n"
 #~ msgstr ""
-#~ "Les fichiers d'entrée contiennent des messages encodés différemment, %"
-#~ "s et %s entre autres.\n"
+#~ "Les fichiers d'entrée contiennent des messages encodés différemment, "
+#~ "%s et %s entre autres.\n"
 #~ "Conversion de la sortie en format UTF-8.\n"
 #~ "Pour sélectionner un encodage différent de sortie, utiliser l'option --"
 #~ "to-code.\n"
@@ -1833,15 +1847,15 @@ msgstr ""
 #~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
 #~ "does not support this conversion."
 #~ msgstr ""
-#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui ne "
-#~ "supporte pas cette conversion."
+#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui "
+#~ "ne supporte pas cette conversion."
 
 #~ msgid ""
 #~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
 #~ "was built without iconv()."
 #~ msgstr ""
-#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). Cette "
-#~ "version a été compilée sans iconv()."
+#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). "
+#~ "Cette version a été compilée sans iconv()."
 
 #~ msgid "backup type"
 #~ msgstr "type d'archive"
@@ -2287,8 +2301,8 @@ msgstr ""
 #~ msgid ""
 #~ "internationalized messages should not contain the `\\%c' escape sequence"
 #~ msgstr ""
-#~ "un message à traduire ne doit pas contenir la séquence d'échappement « "
-#~ "\\%c »"
+#~ "un message à traduire ne doit pas contenir la séquence d'échappement "
+#~ "« \\%c »"
 
 #~ msgid ""
 #~ "The following msgid contains non-ASCII characters.\n"
@@ -2524,8 +2538,8 @@ msgstr ""
 
 #~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
 #~ msgstr ""
-#~ "les spécifications de format de l'argument «%s» n'existent pas « msgstr "
-#~ "»"
+#~ "les spécifications de format de l'argument «%s» n'existent pas « "
+#~ "msgstr »"
 
 #~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
 #~ msgstr ""
@@ -2617,8 +2631,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -2665,7 +2679,8 @@ msgstr ""
 #~ "  -V, --version              identifier le programme, puis terminer\n"
 #~ "\n"
 #~ "La répétition de l'option « -v » augment le niveau de verbosité.\n"
-#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « - »,\n"
+#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « - "
+#~ "»,\n"
 #~ "écrit sur la sortie standard.\n"
 
 #~ msgid "while creating hash table"

diff --git a/gettext-runtime/po/ga.po b/gettext-runtime/po/ga.po
index 1ea31d1f2ed013d1b553f8c923d75c9de6c06c43..a8a5aae170cdf3c2aecc472bf94957237e988cc4 100644 (file)
--- a/gettext-runtime/po/ga.po
+++ b/gettext-runtime/po/ga.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-14 12:15-0500\n"
 "Last-Translator: Kevin Patrick 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=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,67 +19,66 @@ msgstr ""
 msgid "write error"
 msgstr "earráid sa scríobh"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Earráid chórais anaithnid"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Tá an rogha `%s' débhríoch\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: rogha anaithnid `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: rogha neamhcheadaithe -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: rogha neamhbhailí -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tá argóint de dhíth i ndiaidh na rogha -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Tá an rogha `-W %s' débhríoch\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, 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/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -311,6 +311,9 @@ msgstr ""
 "trí úsáid na hathróige timpeallachta TEXTDOMAINDIR.\n"
 "Gnáthchomhadlann chuardaigh: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/gettext-runtime.pot b/gettext-runtime/po/gettext-runtime.pot
index 20e1cc742cb2d1eb5ddc05335b0a2ba78360f847..a2c97e525783812206e6acb717079bad2d2f4ff5 100644 (file)
--- a/gettext-runtime/po/gettext-runtime.pot
+++ b/gettext-runtime/po/gettext-runtime.pot
@@ -6,12 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.17\n"
+"Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,65 +21,64 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '--%s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
 #: gnulib-lib/xmalloc.c:37

diff --git a/gettext-runtime/po/gl.po b/gettext-runtime/po/gl.po
index 49a40a1bd574a86bc0325a5026523ef3b7c1a4f0..c2faf5701f26ad69d5669ef16c17a11d67997f91 100644 (file)
--- a/gettext-runtime/po/gl.po
+++ b/gettext-runtime/po/gl.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.39\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-07-28 17:00+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.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"
@@ -24,67 +25,66 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a opción `%s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a opción `--%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a opción `%c%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a opción `%s' require un argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opción `--%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opción `%c%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción non válida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a opción require un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a opción `-W %s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a opción `%s' require un argumento\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -304,6 +304,9 @@ msgstr ""
 "pódese especificar outro mediante a variable TEXTDOMAINDIR.\n"
 "Directorio estándar de busca: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción ilegal -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1484,8 +1487,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -1511,8 +1514,8 @@ msgstr ""
 #~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
 #~ "para\n"
 #~ "as opcións curtas.\n"
-#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: "
+#~ "%d)\n"
 #~ "  -c, --check                 facer comprobacións dependentes da "
 #~ "linguaxe\n"
 #~ "                              nas cadeas\n"

diff --git a/gettext-runtime/po/id.po b/gettext-runtime/po/id.po
index 55d5dfcb788a7034fcdea266360f7a1d13589702..cd7d789a2c05d53193c855c51a4fe7aea30b40a5 100644 (file)
--- a/gettext-runtime/po/id.po
+++ b/gettext-runtime/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-10-02 13:18+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-12-31 07:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -23,67 +23,66 @@ msgstr ""
 msgid "write error"
 msgstr "kesalahan penulisan"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tak dikenal"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan `%s' rancu\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:588 gnulib-lib/getopt.c:593
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan `%c%s' tidak membolehkan argumen\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"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "pilihan %s: `%s' memerlukan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tak dikenal `--%s'\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tak dikenal `%c%s'\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: pilihan ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- %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"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan `-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan `-W %s' tidak membolehkan sebuah argumen\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "pilihan %s: `%s' memerlukan sebuah argumen\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -318,6 +317,9 @@ msgstr ""
 "lingkungan TEXTDOMAINDIR.\n"
 "Direktori pencarian standar: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: pilihan ilegal -- %c\n"
+
 # )
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"

diff --git a/gettext-runtime/po/it.po b/gettext-runtime/po/it.po
index 83792a28a70fc939f6894be2c690408d96bbd017..dce062ffe5c50a05d4c9a946ad3274bd34b2fdb8 100644 (file)
--- a/gettext-runtime/po/it.po
+++ b/gettext-runtime/po/it.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-30 17:39+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -20,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: l'opzione '%s' è ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '--%s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '%c%s' non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l'opzione '%s' richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opzione '--%s' non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opzione '%c%s' non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opzione illecita -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opzione non valida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l'opzione '-W %s' è ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione '-W %s' non accetta argomenti\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l'opzione '%s' richiede un argomento\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -316,3 +316,6 @@ msgstr ""
 "nella directory solita, può essere specificata un'altra posizione con la\n"
 "variabile d'ambiente TEXTDOMAINDIR.\n"
 "Directory di ricerca standard: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illecita -- %c\n"

diff --git a/gettext-runtime/po/ja.po b/gettext-runtime/po/ja.po
index 4b7cdee71f7579c70288eab9b797df8913fc9615..33240fc5f2dcb3f28b00e9c077a6738c13d277c3 100644 (file)
--- a/gettext-runtime/po/ja.po
+++ b/gettext-runtime/po/ja.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-16 10:29+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "̤ÃΤΥ·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: °ú¿ô¤¬É¬Íפʥª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -311,3 +311,6 @@ msgstr ""
 "¥É¥á¥¤¥ó¤¬·è¤Þ¤ê¤Þ¤¹. ¤â¤·É¸½à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤¬\n"
 "¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð, ´Ä¶­ÊÑ¿ô TEXTDOMAINDIR ¤Ç»ØÄꤵ¤ì¤¿¾ì½ê¤«¤éõ¤·¤Þ¤¹.\n"
 "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"

diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po
index b8bb3473d4b834a4b723ff41d45282e849195694..8e946e7ef3a7a98d842dd5ede97b973ff3042743 100644 (file)
--- a/gettext-runtime/po/ko.po
+++ b/gettext-runtime/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-10 21:59+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -23,74 +23,73 @@ msgstr ""
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s'은(는) 모호한 옵션입니다\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: 잘못된 옵션 -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 부적절한 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap, fuzzy
+#, fuzzy, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
@@ -314,6 +313,9 @@ msgstr ""
 "\n"
 "표준 탐색 디렉터리: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: 잘못된 옵션 -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/nb.po b/gettext-runtime/po/nb.po
index da2758d176410e6f7a720d3ad4973976346713e9..94df9be084e8cb2d27959d2946acb09246b6d81e 100644 (file)
--- a/gettext-runtime/po/nb.po
+++ b/gettext-runtime/po/nb.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flagget «%s» er flertydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget «--%s» tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget «%c%s» tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg «--%s»\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg «%c%s»\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig flagg -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg «-W %s» er flertydig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flagget «%s» krever et argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -301,6 +301,9 @@ msgstr ""
 "miljøvariabelen TEXTDOMAINDIR.\n"
 "Standard søkekatalog er: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovlig flagg -- %c\n"
+
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
 #~ msgid ""
@@ -1395,8 +1398,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-runtime/po/nl.po b/gettext-runtime/po/nl.po
index 80e2f1fab18b99937d44ae667eb9f5f8c3276c21..cced0f4914e1850d3febd43362eb15ee4de5463e 100644 (file)
--- a/gettext-runtime/po/nl.po
+++ b/gettext-runtime/po/nl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-16 18:51+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,67 +22,66 @@ msgstr ""
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: optie '%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -317,3 +317,6 @@ msgstr ""
 "wordt in de gewone map, kan een andere locatie worden opgegeven via de\n"
 "omgevingsvariabele TEXTDOMAINDIR.\n"
 "Standaard zoekmap: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"

diff --git a/gettext-runtime/po/nn.po b/gettext-runtime/po/nn.po
index 14fbd045e58309448a96e5e2f409bcc1c336e05e..ba66c10252a59ece0b731eba086243947a4030ad 100644 (file)
--- a/gettext-runtime/po/nn.po
+++ b/gettext-runtime/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-10-02 13:18+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-08-13 18:40+0200\n"
 "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -23,67 +23,66 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefeil"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Valet «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Valet «--%s» tek ikkje 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"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Valet «%c%s» tek ikkje 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"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Valet «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: Ukjent val – «--%s»\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: Ukjent val – «%c%s»\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: Ulovleg val – %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Ugyldig val – %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"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Valet treng eit argument – %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Valet «-W %s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Valet «-W %s» tek ikkje argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Valet «%s» treng eit argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -314,6 +313,9 @@ msgstr ""
 "«TEXTDOMAIN».\n"
 "Standard søkjekatalog er: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: Ulovleg val – %c\n"
+
 #~ msgid ""
 #~ "internationalized messages should not contain the `\\%c' escape sequence"
 #~ msgstr ""

diff --git a/gettext-runtime/po/pl.po b/gettext-runtime/po/pl.po
index 60dc097014291e7ade869176af11aafb896ade3e..93426aeb6848f1c8ea28c17e83e24d40630a7998 100644 (file)
--- a/gettext-runtime/po/pl.po
+++ b/gettext-runtime/po/pl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-16 16:00+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "b³±d zapisu"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nieznany b³±d systemu"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcja: `%s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcja `%s' wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nierozpoznana opcja `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nierozpoznana opcja `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: niedozwolona opcja -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: b³êdna opcja -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga argumentu -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opcja `%s' wymaga argumentu\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -310,3 +310,6 @@ msgstr ""
 "znaleziony w domy¶lnym katalogu, inna lokalizacja mo¿e byæ podana przez\n"
 "zmienn± ¶rodowiskow± TEXTDOMAINDIR.\n"
 "Domy¶lnie przeszukiwany katalog: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: niedozwolona opcja -- %c\n"

diff --git a/gettext-runtime/po/pt.po b/gettext-runtime/po/pt.po
index d2e2e286277d29e9b78b1d1ff1e2dd8ddd97c8f5..2e39ac3e8a5f2e64fd6c96139ecf1d97bb48d36d 100644 (file)
--- a/gettext-runtime/po/pt.po
+++ b/gettext-runtime/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-12-24 15:36+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-12-09 18:24+0100\n"
 "Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -20,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a opção `%c%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a opção `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opção ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a opção '-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção '-W %s' não permite um argumento\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a opção `%s' requere um argumento\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -317,3 +316,6 @@ msgstr ""
 "stdout. Em vez disso as mensagens encontradas no catálogo seleccionado\n"
 "são traduzidas.\n"
 "Pasta padrão de pesquisa: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"

diff --git a/gettext-runtime/po/pt_BR.po b/gettext-runtime/po/pt_BR.po
index bcc208ea64df0fb16731e0134da87ba01437df05..d1966fdfe15d74621091c4a5aa92d71069d96922 100644 (file)
--- a/gettext-runtime/po/pt_BR.po
+++ b/gettext-runtime/po/pt_BR.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-04-03 08:25+02:00\n"
 "Last-Translator: Flávio Bruno Leitner <flavio@conectiva.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: 8bit\n"
@@ -21,67 +22,66 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opção `--%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opção `%c%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opção `%s' requer um argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opção ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requer um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opção `-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita parâmetros\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opção `%s' requer um argumento\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -306,6 +306,9 @@ msgstr ""
 "mensagens encontradas no catálogo selecionado\n"
 "Diretório de pesquisa padrão: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1150,8 +1153,8 @@ msgstr ""
 #~ msgid ""
 #~ "internationalized messages should not contain the `\\%c' escape sequence"
 #~ msgstr ""
-#~ "mensagens internacionalizadas não devem conter o caractere de escape `\\%"
-#~ "c'"
+#~ "mensagens internacionalizadas não devem conter o caractere de escape `\\"
+#~ "%c'"
 
 #~ msgid "cannot create output file \"%s\""
 #~ msgstr "não foi possível criar o arquivo de saída \"%s\""
@@ -1334,8 +1337,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -1361,8 +1364,8 @@ msgstr ""
 #~ "\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: "
+#~ "%d)\n"
 #~ "  -c, --check              executa conferências dependentes de linguagem "
 #~ "em strings\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "

diff --git a/gettext-runtime/po/ro.po b/gettext-runtime/po/ro.po
index 7dbea806dda034f137d44b73bc8fbe3d2289ea7f..4a27808a1538160e0346c86d60c689c53ff36887 100644 (file)
--- a/gettext-runtime/po/ro.po
+++ b/gettext-runtime/po/ro.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2003-11-23 09:19+0200\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"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscutã"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opþiunea `%s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `--%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opþiune necunoscutã `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opþiune necunoscutã `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opþiune ilegalã -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opþiune invalidã -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opþiunea necesitã un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opþiunea `-W %s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opþiunea `%s' necesitã un parametru\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -310,6 +310,9 @@ msgstr ""
 "mediu TEXTDOMAINDIR.\n"
 "Directorul de cãutare standard: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opþiune ilegalã -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/ru.po b/gettext-runtime/po/ru.po
index ba06f2aae7c2fddf4e599212bdb830c7f26e1ed3..b1da37fbbd0370786403cb6ed62bf63522e9a5fb 100644 (file)
--- a/gettext-runtime/po/ru.po
+++ b/gettext-runtime/po/ru.po
@@ -6,81 +6,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-06-14 09:43+0400\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"
-"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"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -311,6 +311,9 @@ msgstr ""
 "ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ TEXTDOMAINDIR.\n"
 "óÔÁÎÄÁÒÔÎÙÊ ËÁÔÁÌÏÇ ÐÏÉÓËÁ: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/sk.po b/gettext-runtime/po/sk.po
index d4446b2d3fe4c92959a6669afef10f5b3e62a82d..3f6ae639fcc6ba5224327b9cba899f9faa9c8dfd 100644 (file)
--- a/gettext-runtime/po/sk.po
+++ b/gettext-runtime/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-12-24 15:36+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-02-21 00:12+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -21,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: voľba `%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba `--%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba `%c%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: voľba `%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznáma voľba `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznáma voľba `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neprípustná voľba -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba `-W %s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba `-W %s' nedovoľuje použitie parametra\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: voľba `%s' vyžaduje parameter\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -318,3 +317,6 @@ msgstr ""
 "TEXTDOMAIN. Ak sa katalóg správ nenachádza v obvyklom adresári, iné umiestnenie\n"
 "môže byť určené obsahom premennej prostredia TEXTDOMAINDIR.\n"
 "Štandardný adresár, v ktorom sa budú hľadať katalógy: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neprípustná voľba -- %c\n"

diff --git a/gettext-runtime/po/sl.po b/gettext-runtime/po/sl.po
index 98a707f5ca7daa218a3a81ee18dba9c2cde2efb0..429adce0a15ec63e15f18c21912f2c63a2faf56b 100644 (file)
--- a/gettext-runtime/po/sl.po
+++ b/gettext-runtime/po/sl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-16 09:38+0200\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -22,67 +23,66 @@ msgstr ""
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: izbira »%s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: izbira »%s« zahteva argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznana izbira »--%s«\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznana izbira »%c%s«\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedovoljena izbira -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neveljavna izbira -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: izbira zahteva argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: izbira »-W %s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -311,6 +311,9 @@ msgstr ""
 "določimo alternativno lokacijo s spremenljivko TEXTDOMAINDIR.\n"
 "Privzet imenik s katalogom sporočil: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nedovoljena izbira -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -976,8 +979,8 @@ msgstr ""
 #~ msgid ""
 #~ "A special builtin command called '0' outputs the translation, followed by "
 #~ "a\n"
-#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -"
-#~ "0\".\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
 #~ msgstr ""
 #~ "Poseben vgrajen ukaz ,0` izpiše prevod in izpis zaključi z znakom s kodo "
 #~ "nič.\n"
@@ -1243,8 +1246,8 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "      --no-hash               binary file will not include the hash "
 #~ "table\n"
 #~ msgstr ""
@@ -2473,8 +2476,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-runtime/po/sr.po b/gettext-runtime/po/sr.po
index fbd5b16c6e82bcb8c354c67014137ad48c7ce303..a8fe9fae4ff9451c486482621b58679c3a9ae485 100644 (file)
--- a/gettext-runtime/po/sr.po
+++ b/gettext-runtime/po/sr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2003-11-18 23:48+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "грешка при упису"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: опција „%s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: неисправна опција %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: опција „-W %s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -309,6 +309,9 @@ msgstr ""
 "променљиве окружења TEXTDOMAINDIR.\n"
 "Уобичајени директоријум за тражење: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неисправна опција %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/sv.po b/gettext-runtime/po/sv.po
index 248a0793624eeb43e5fdc99630524d97850f049a..72ae77181d96c4d285bf828b830c6beca1a28b3e 100644 (file)
--- a/gettext-runtime/po/sv.po
+++ b/gettext-runtime/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-12-24 15:36+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-02-08 10:01+0100\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -313,3 +312,6 @@ msgstr ""
 "TEXTDOMAIN. Om meddelandekatalogen inte hittas i den normala katalogen så\n"
 "kan en annan katalog anges med miljövariabeln TEXTDOMAINDIR.\n"
 "Normal katalog för meddelandekataloger: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: otillåten flagga -- %c\n"

diff --git a/gettext-runtime/po/tr.po b/gettext-runtime/po/tr.po
index 5855dcbe401f9ed2b2db7ff156999e3ba999b09a..8a5f84b9fe456e4c4fdbbafa161f5416654cda24 100644 (file)
--- a/gettext-runtime/po/tr.po
+++ b/gettext-runtime/po/tr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2006-07-01 08:58+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"
@@ -20,67 +21,66 @@ msgstr ""
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, 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:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, 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/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -306,6 +306,9 @@ msgstr ""
 "TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n"
 "Standart arama dizini: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: kuraldışı seçenek -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -993,8 +996,8 @@ msgstr ""
 #~ msgid ""
 #~ "A special builtin command called '0' outputs the translation, followed by "
 #~ "a\n"
-#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -"
-#~ "0\".\n"
+#~ "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs "
+#~ "-0\".\n"
 #~ msgstr ""
 #~ "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n"
 #~ "çıktılar.  \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak "
@@ -1252,14 +1255,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "Output details:\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "      --no-hash               binary file will not include the hash "
 #~ "table\n"
 #~ msgstr ""
 #~ "Çıktı ayrıntıları:\n"
-#~ "  -a, --alignment=SAYI        dizgeleri SAYI bayta ayarlar (öntanımlı: %"
-#~ "d)\n"
+#~ "  -a, --alignment=SAYI        dizgeleri SAYI bayta ayarlar (öntanımlı: "
+#~ "%d)\n"
 #~ "      --no-hash               ikilik dosya saçılma tablosunu içermeyecek\n"
 
 #~ msgid ""

diff --git a/gettext-runtime/po/uk.po b/gettext-runtime/po/uk.po
index 0f0c5991ac3de09638cd3d87aff2cfe9e1133979..81bbc4c9a3c83a7d38dc412bfdc0632c20422510 100644 (file)
--- a/gettext-runtime/po/uk.po
+++ b/gettext-runtime/po/uk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-07-05 17:30+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,67 +20,66 @@ msgstr ""
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `%s'\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: параметр `--%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: нерозпізнаний параметр `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: нерозпізнаний параметр `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: неправильний параметр -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: параметр %c має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `-W %s'\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -309,6 +309,9 @@ msgstr ""
 "змінної оточення TEXTDOMAINDIR.\n"
 "Стандартний каталог пошуку: %s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неправильний параметр -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index e10e17a6cf96bf5b5992e56279d02fef56593f2c..c9b5d07a712bddb4e9fea98514de9856b9b305f9 100644 (file)
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-09-24 22:39+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -22,67 +22,66 @@ msgstr ""
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, 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:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, 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:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần đến đối số\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: không nhận diện tùy chọn « --%s »\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: không nhận diện tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: không cho phép tùy chọn « -- %c »\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, 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:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tùy chọn cần đến đối số « -- %c »\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tùy chọn « %s » cần đến đối số\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -322,3 +321,6 @@ msgstr ""
 "phân loại thông điệp trong thư mục bình thường, vị trí khác có thể được\n"
 "xác định bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
 "Thư mục tìm kiếm chuẩn: %s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: không cho phép tùy chọn « -- %c »\n"

diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po
index 0528f4b79eb11acabb93c2db1c2a891c25343e27..3bec1d77cd616558769341dd16167550bd198596 100644 (file)
--- a/gettext-runtime/po/zh_CN.po
+++ b/gettext-runtime/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-10-02 13:18+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-08-09 20:25+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -26,67 +26,66 @@ msgstr ""
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：选项“%s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:588 gnulib-lib/getopt.c:593
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:655 gnulib-lib/getopt.c:971
-#: gnulib-lib/getopt.c:990
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：非法选项 ─ %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效选项 ─ %c\n"
 
-#: gnulib-lib/getopt.c:823 gnulib-lib/getopt.c:839 gnulib-lib/getopt.c:1043
-#: gnulib-lib/getopt.c:1061
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要一个参数 ─ %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许有参数\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s：选项“%s”需要一个参数\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -309,3 +308,6 @@ msgstr ""
 "假如消息一览表文件不在正常的目录下，可以用环境变量 TEXTDOMAINDIR 指定\n"
 "消息一览表文件所在的位置。\n"
 "标准的搜索目录为：%s\n"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：非法选项 ─ %c\n"

diff --git a/gettext-runtime/po/zh_HK.po b/gettext-runtime/po/zh_HK.po
index b5a45c6cf274d7fd4147b02be6b99bb81a6fba29..c3f7eaeb24841b9ce715388ae402da9499582368 100644 (file)
--- a/gettext-runtime/po/zh_HK.po
+++ b/gettext-runtime/po/zh_HK.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2006-07-05 17:16+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,67 +24,66 @@ msgstr ""
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：選項「--%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：選項「%s」需要參數\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法識別選項「--%s」\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法識別選項「%c%s」\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：選項不合法 -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項「-W %s」不明確\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：選項「-W %s」不允許有參數\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s：選項「%s」需要參數\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -303,6 +303,9 @@ msgstr ""
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：選項不合法 -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-runtime/po/zh_TW.po b/gettext-runtime/po/zh_TW.po
index 0b836957188d6208edf442bcd60d26c5af4c3f22..e2697a1cb1494ea4dd884e7aec783ff6bb137f96 100644 (file)
--- a/gettext-runtime/po/zh_TW.po
+++ b/gettext-runtime/po/zh_TW.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2006-07-05 17:21+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,67 +24,66 @@ msgstr ""
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：選項「--%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：選項「%s」需要參數\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法識別選項「--%s」\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法識別選項「%c%s」\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：選項不合法 -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項「-W %s」不明確\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：選項「-W %s」不允許有參數\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s：選項「%s」需要參數\n"
+
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -303,6 +303,9 @@ msgstr ""
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：選項不合法 -- %c\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index e0c4246e52b11fbb007892bd2eea8e5bccf77d40..83a4ab483379947bb945bf09f6113eff206f1db6 100644 (file)
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
+"Language: be\n"
 "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"
 
 #: gnulib-lib/argmatch.c:133
 #, fuzzy, c-format
@@ -31,24 +32,24 @@ msgstr "неадназначны аргумэнт `%s' для `%s'"
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргумэнты:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "немагчыма стварыць часовую дырэкторыю,\n"
 "выкарыстоўвываючы ўзор \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -59,44 +60,44 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "памылка чытаньня \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "памылка запісу файла \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "памылка пасля чытаньня \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() памылка"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
@@ -107,74 +108,73 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s падпрацэс спынены з-за памылкі"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: несапраўдны выбар -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: выбар `-W %s' не патрабуе аргумэнтаў\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -186,20 +186,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "памылка ў час запісу файла \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
@@ -210,20 +210,20 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "падпрацэс %s, памылка ўводу-вываду"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -242,70 +242,69 @@ msgstr "не магчыма стварыць канвеэр"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, fuzzy, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s падпрацэс"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/format.c:143
+#: src/format.c:148
 #, fuzzy, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
 
 #: src/format-boost.c:449
@@ -330,9 +329,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -372,48 +371,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -503,21 +502,20 @@ msgid ""
 msgstr ""
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
 
@@ -532,11 +530,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -583,13 +581,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
@@ -600,56 +598,53 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -686,11 +681,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -699,38 +694,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Аўтар %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "вельмі шмат аргумэнтаў"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
@@ -768,29 +763,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -802,11 +797,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
 
@@ -815,30 +810,30 @@ msgstr "Паведамляйце аб памылках на адрас <bug-gnu-
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -847,40 +842,40 @@ msgstr ""
 "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
@@ -888,24 +883,24 @@ msgstr ""
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -916,203 +911,221 @@ msgstr ""
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1133,31 +1146,31 @@ msgstr ""
 "                           даўжэй чым шырыня, на некалькі радкоў\n"
 "  -s, --sort-output        ствараць упарадкаваны вывад\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1181,105 +1194,97 @@ msgstr ""
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1297,22 +1302,22 @@ msgstr ""
 "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
 "лепшай праверкі.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1322,7 +1327,12 @@ msgstr ""
 "  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def."
 "po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
@@ -1330,42 +1340,42 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...але гэта вызначэньне падобна"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1373,12 +1383,12 @@ msgstr[0] "знойдзена %d фатальная памылка"
 msgstr[1] "знойдзена %d фатальныя памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "неабходна задаць не менш двух файлаў"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1399,30 +1409,30 @@ msgstr ""
 "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
 "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, fuzzy, c-format
 msgid "Conversion target:\n"
 msgstr "памылка пераўтварэньня"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
@@ -1430,46 +1440,46 @@ msgstr ""
 "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
 "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1482,22 +1492,22 @@ msgstr ""
 "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
 "пазначаюцца як недакладныя (fuzzy).\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "прапушчана назва каманды"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1511,7 +1521,7 @@ msgstr ""
 "адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
 "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1520,42 +1530,42 @@ msgstr ""
 "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
 "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "памылка запісу ў stdout"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "памылка запісу ў падпрацэс %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "прапушчана назва фільтра"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1565,18 +1575,18 @@ msgstr ""
 "ўводу\n"
 "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1584,91 +1594,73 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "памылка чытаньня з падпрацэса %s"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1676,7 +1668,7 @@ msgstr[0] "%d паведамленьне перакладзена"
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1690,7 +1682,7 @@ msgstr[2] ""
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1704,17 +1696,17 @@ msgstr[2] ""
 ",\n"
 "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1723,31 +1715,31 @@ msgstr ""
 "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
 "і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
@@ -1755,7 +1747,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1765,13 +1757,13 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, fuzzy, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
@@ -1779,41 +1771,41 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1831,48 +1823,48 @@ msgstr ""
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1880,33 +1872,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1914,105 +1906,105 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: %"
-"d)\n"
+"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
+"%d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: %"
-"d)\n"
+"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
+"%d)\n"
 "      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2020,14 +2012,14 @@ msgid ""
 msgstr ""
 "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2067,30 +2059,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2101,12 +2093,12 @@ msgstr ""
 "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
 "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створан %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2115,12 +2107,12 @@ msgstr ""
 "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
 "карыстальніка.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2131,12 +2123,12 @@ msgstr ""
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2147,18 +2139,18 @@ msgstr ""
 "      --strict                уключае рэжым жорсткага адпавяданьня Uniforum\n"
 "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2166,12 +2158,12 @@ msgstr ""
 "Знойдзен больш чым адзін .pot файл.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2179,14 +2171,14 @@ msgstr ""
 "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2198,22 +2190,22 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Беларускі пераклад для %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2221,7 +2213,7 @@ msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, fuzzy, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2230,26 +2222,26 @@ msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "увага: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2258,7 +2250,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2267,7 +2259,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2276,12 +2268,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2289,7 +2281,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2298,7 +2290,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2306,25 +2298,25 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2332,40 +2324,40 @@ msgstr ""
 "выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
 "дзяленьне на нуль"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2375,7 +2367,7 @@ msgstr[1] "...але некаторыя паведамленьні маюць т
 msgstr[2] ""
 "...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2383,88 +2375,88 @@ msgstr[0] "...але некаторыя паведамленьні маюць а
 msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
 msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 #, fuzzy
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "поле `%s' Ñ\83Ñ\81Ñ\91 Ñ\8fÑ\88Ñ\87Ñ\8d мае пачатковае значэньне\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "некаÑ\82оÑ\80Ñ\8bÑ\8f палÑ\96 загалока Ñ\9eÑ\81Ñ\91 Ñ\8fÑ\88Ñ\87Ñ\8d маÑ\8eÑ\86Ñ\8c пачатковае значэньне\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2473,15 +2465,15 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2490,16 +2482,16 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s рэчаісны толькі з %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2520,51 +2512,51 @@ msgstr ""
 "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
 "лепшай праверкі.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2576,7 +2568,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2584,12 +2576,7 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2598,22 +2585,22 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2622,26 +2609,28 @@ msgstr ""
 "%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
 "прапушчана %ld, састарэлых %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " зроблена.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s і яўная назва файла ўзаема выключальны"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2651,7 +2640,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
@@ -2659,7 +2648,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2669,7 +2658,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, fuzzy, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2678,17 +2667,17 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2705,41 +2694,41 @@ msgstr ""
 "абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
 "зададзеную дырэкторыю.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2752,12 +2741,12 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2767,7 +2756,7 @@ msgstr ""
 "  -d, --repeated                 друкаваць толькі паўтараючыеся\n"
 "  -u, --unique                   друкаваць толькі непаўторныя\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2854,65 +2843,65 @@ msgstr "першая форма ліку мае ненулявы індэкс"
 msgid "plural form has wrong index"
 msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "вельмі шмат памылак..."
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "двайное вызначэньне паведамленьня"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...гэта месцазнаходжаньне першага вызначэньня"
@@ -3002,28 +2991,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "чакалісь два аргумэнты"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "памылка запісу ў stdout"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3057,47 +3061,47 @@ msgid ""
 "support them."
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "стандартны вывад"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3109,14 +3113,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3130,7 +3134,7 @@ msgstr ""
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3152,8 +3156,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3170,14 +3174,14 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "памылка ў час запісу файла \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3197,99 +3201,96 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "памылка iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3298,55 +3299,53 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: нерэчаіснае вызначэньне радка"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3354,7 +3353,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3362,7 +3361,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3370,7 +3369,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3378,7 +3377,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3386,77 +3385,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: нерэчаіснае вызначэньне радка"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: прапушчан нумар пасьля #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: нерэчаісны выраз-радок"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3468,58 +3467,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3528,14 +3530,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3543,7 +3545,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3552,17 +3554,17 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
@@ -3570,12 +3572,12 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
@@ -3583,7 +3585,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -3591,89 +3593,106 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: увага: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, fuzzy, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3682,7 +3701,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3692,27 +3711,27 @@ msgstr ""
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3720,7 +3739,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невядомая мова `%s'"
@@ -3729,6 +3748,28 @@ msgstr "невядомая мова `%s'"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: несапраўдны выбар -- %c\n"
+
+#, fuzzy
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "памылка чытаньня з падпрацэса %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index 6533b50613090090318bc2b56eda800721af16ea..c68b0caca6280c437b34fa47a3063a5355c24e82 100644 (file)
--- a/gettext-tools/po/bg.po
+++ b/gettext-tools/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2010-02-17 00:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2010-01-28 23:49+0200\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -57,10 +57,10 @@ msgstr "не можа да се изтрие временна директори
 msgid "write error"
 msgstr "грешка при запис"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка при отваряне за четене на \"%s\""
@@ -86,8 +86,8 @@ msgstr "грешка при записване \"%s\""
 msgid "error after reading \"%s\""
 msgstr "грешка след прочитане на \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:879
-#: src/msginit.c:954 src/msginit.c:1114 src/msginit.c:1213
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,69 +104,73 @@ msgstr "не е намерен C# компилатор, да се опита п
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "не е намерена виртуална машина за C#, да се опита при инсталиран pnet"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Неизвестна системна грешка"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "пропадна подпроцес %s"
 
-#: gnulib-lib/getopt.c:529 gnulib-lib/getopt.c:545
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: опцията '%s' е двусмислена\n"
 
-#: gnulib-lib/getopt.c:578 gnulib-lib/getopt.c:582
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опцията '--%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:591 gnulib-lib/getopt.c:596
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опцията '%c%s' е без аргумент\n"
 
-#: gnulib-lib/getopt.c:639 gnulib-lib/getopt.c:658 gnulib-lib/getopt.c:961
-#: gnulib-lib/getopt.c:980
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, fuzzy, c-format
-msgid "%s: option '%s' requires an argument\n"
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опцията '%s' изисква аргумент\n"
 
-#: gnulib-lib/getopt.c:696 gnulib-lib/getopt.c:699
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: неразпозната опция `--%s'\n"
 
-#: gnulib-lib/getopt.c:707 gnulib-lib/getopt.c:710
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: неразпозната опция '%c%s'\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправилна опция -- %c\n"
 
-#: gnulib-lib/getopt.c:812 gnulib-lib/getopt.c:829 gnulib-lib/getopt.c:1032
-#: gnulib-lib/getopt.c:1050
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опцията изисква аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:882 gnulib-lib/getopt.c:898
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: опцията `-W %s' е двусмислена\n"
 
-#: gnulib-lib/getopt.c:922 gnulib-lib/getopt.c:940
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опцията `-W %s' е без аргумент\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опцията '%s' изисква аргумент\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -178,14 +182,14 @@ msgstr "неправилен аргумент за \"версия на изто
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неправлен аргумент за \"версия на резултат\" за compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1126
-#: src/write-java.c:1138
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не успя създаването на \"%s\""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1147 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -205,8 +209,8 @@ msgstr ""
 "не е намерена виртуална машина за Java, да се опита с инсталиран gcj или със "
 "задаване на $JAVAC"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:887 src/msginit.c:962
-#: src/msginit.c:1122
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s В/И грешка при подпроцес"
@@ -218,8 +222,8 @@ msgstr "%s В/И грешка при подпроцес"
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "не можа да се създаде канал"
@@ -280,7 +284,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -290,7 +294,7 @@ msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -298,7 +302,7 @@ msgstr "указания формат за аргумент %u не същест
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -710,11 +714,11 @@ msgid ""
 "1 and 9."
 msgstr "Знакът, който прекратява директива номер %u, не е число между 1 и 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -727,38 +731,38 @@ msgstr ""
 "Това е свободен програмен продукт: свободни сте да го променяте и разпространявате.\n"
 "Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Бруно Хаибле"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "твърде много аргументи"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "За повече информация, опитайте '%s --help'.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ]\n"
@@ -794,29 +798,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси за мрежово име\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Осведомително извеждане:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               извеждане на информация за версия и изход\n"
@@ -825,11 +829,11 @@ msgstr "  -V, --version               извеждане на информаци
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
@@ -840,30 +844,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "не можа да се определи мрежовото име"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "позволява се най-много един входящ файл"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s са взаимоизключващи се"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -872,10 +876,10 @@ msgstr ""
 "Прецежда съобщенията от каталога с преводи според техните атрибути и \n"
 "обработва атрибутите.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -883,23 +887,23 @@ msgstr ""
 "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" "
 "опции.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Местоположение на входящ файл:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХФАЙЛ                      входящ PO файл\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -907,33 +911,33 @@ msgstr ""
 "  -D, --directory=ДИР         добавя директория ДИР към списъка за търсене "
 "на входящи файлове\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния "
 "вход.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Местоположение на резултата:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=ФАЙЛ      записване на резултата в зададения файл\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -942,12 +946,12 @@ msgstr ""
 "Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис "
 "или той е -\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор на съобщения:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -955,7 +959,7 @@ msgstr ""
 "      --translated            запазване на преведените, изтриване на "
 "непреведените съобщения\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -963,64 +967,64 @@ msgstr ""
 "      --untranslated          запазване на непреведените, изтриване на "
 "преведение съобщения\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              изтриване на съобщенията отбелязани като "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            запазване на на съобщенията отбелязани като "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           изтриване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         запазване на остарялите #~ съобщения\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Управление на атрибутите:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             установяване на всички съобщения като мъгляви"
 "('fuzzy')\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           установяване на всички съобщения да не са "
 "мъгляви('fuzzy')\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          установяване на всички съобщения като "
 "остаряли\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        установяване на всички съобщения да не са "
 "остаряли\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1029,14 +1033,14 @@ msgstr ""
 "      --clear-previous        изтрива \"предишния\" msgid от всички "
 "съобщения\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ФАЙЛ.po     управлява само записите изброени в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1044,28 +1048,28 @@ msgstr ""
 "      --ignore-file=ФАЙЛ.po   управлява само записите, които не са изброени "
 "в ФАЙЛ.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синоним за --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              синоним за --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис на входящия файл:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1073,8 +1077,8 @@ msgstr ""
 "  -P, --properties-input      входящия файл е със синтаксис на Java ."
 "properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1083,17 +1087,41 @@ msgstr ""
 "      --stringtable-input     входящия файл е със синтаксис на NeXTstep/"
 "GNUstep .низове\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробности за извеждане:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 винаги с използване на цвят и др. атрибути за "
+"текст\n"
+"      --color=КОГА            използване на цвят и др. атрибути за текст, "
+"ако КОГА.\n"
+"                              КОГА може да бъде 'always', 'never', 'auto', "
+"или 'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr "      --style=СТИЛФАЙЛ        задава CSS правила за --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1101,9 +1129,9 @@ msgstr ""
 "  -e, --no-escape             без използване на Си освобождаващи "
 "последователности в резултата (по подразбиране)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1111,30 +1139,30 @@ msgstr ""
 "  -E, --escape                използване на Си освобождаващи "
 "последователности в резултата, без разширени знаци\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              записване на PO файл, дори ако е празен\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                записване на .po файл в стил с отмествания\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           без записване на редове '#: filename:line'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1142,8 +1170,8 @@ msgstr ""
 "  -n, --add-location          създаване на редове '#: filename:line' (по "
 "подразбиране)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1151,34 +1179,34 @@ msgstr ""
 "      --strict                записва строго отговарящ за уеднаквяване .po "
 "файл\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записване на Java .properties файл\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    записване на NeXTstep/GNUstep .strings файл\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ЦЯЛО            установяване на ширината на изходящата "
 "страница\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1187,27 +1215,27 @@ msgstr ""
 "      --no-wrap               без разделяне на няколко реда на съобщения,\n"
 "                              по-дълги от ширината на изходящата страница\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           резултата да е подреден\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          подреждане на резултата по място на файла\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "избран е невъзможен критерии за избор (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]...\n"
@@ -1235,25 +1263,25 @@ msgstr ""
 "--use-first, като тогава ще се вземат от първия PO файл, който ги определя.\n"
 "От всички PO файлове ще се натрупат позициите във файловете.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХФАЙЛ ...                  входящи файлове\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=ФАЙЛ       получаване на списъка с входящи файлове от "
 "ФАЙЛ\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ако входящия файл е -, се чете от стандартния вход.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1274,7 +1302,7 @@ msgstr ""
 "това\n"
 "                              По-поразбиране 0, ако не е установено\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1283,8 +1311,8 @@ msgstr ""
 "  -u, --unique                съкращения за --less-than=2, поисква се\n"
 "                              извеждане на неповтарящите се съобщения\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1292,8 +1320,8 @@ msgstr ""
 "  -P, --properties-input      входящите файлове са с Java .properties "
 "синтаксис\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1303,12 +1331,12 @@ msgstr ""
 "strings\n"
 "                              синтаксис\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодировка при извеждане\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1317,48 +1345,28 @@ msgstr ""
 "      --use-first             използване на първия наличен превод за всяко\n"
 "                              съобщение, без сливане на отделни преводи\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 винаги с използване на цвят и др. атрибути за "
-"текст\n"
-"      --color=КОГА            използване на цвят и др. атрибути за текст, "
-"ако КОГА.\n"
-"                              КОГА може да бъде 'always', 'never', 'auto', "
-"или 'html'.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=СТИЛФАЙЛ        задава CSS правила за --color\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Петер Милер"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "точно 2 входящи файла са необходими"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [ОПЦИЯ] def.po ref.pot\n"
@@ -1390,12 +1398,12 @@ msgstr "  def.po                      преводи\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     препратки към източници\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Уточняване на операциите:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1404,7 +1412,7 @@ msgstr ""
 "  -m, --multi-domain          приложи ref.pot за всяка от областите в def."
 "po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     да не се използва размито съвпадение\n"
@@ -1429,17 +1437,17 @@ msgstr "съобщението не е преведено "
 msgid "this message needs to be reviewed by the translator"
 msgstr "съобщението трябва да се прегледа от преводача"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "съобщението се използва, но не е определено..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...но определението е подобно"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "съобщението се използва, но не е определено в %s"
@@ -1456,12 +1464,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "открита е %d пагубна грешка"
 msgstr[1] "открити са %d пагубни грешки"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "най-малко два реда трябва да се зададат"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1482,7 +1490,7 @@ msgstr ""
 "--use-first, като тогава ще се вземат от първия PO файл, който ги определя.\n"
 "От всички PO файлове ще се натрупат позициите във файловете.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1492,42 +1500,42 @@ msgstr ""
 "това\n"
 "                              По-поразбиране 1, ако не е установено\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           без записване на заглавен 'msgid \"\"' запис\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Преобразува каталог с преводи в различна кодировка за знаци.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Цел за преобразуване:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Кодировка по подразбиране е текущата кодировка на локала.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                резултат в стил с отместване\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           подтискане на редове '#: filename:line'\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1535,28 +1543,28 @@ msgstr ""
 "      --add-location          запазване на редове '#: filename:line' (по "
 "подразбиране)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строг уеднаквен стил за резултат\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "не е зададен входящ файл"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "необходим е точно един входящ файл"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЯ] ВХФАЙЛ\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1569,7 +1577,7 @@ msgstr ""
 "създаден от xgettext).  На непреведените записи се присвоява превод,\n"
 "който е еднакъв с msgid.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХФАЙЛ                      входящ PO или POT файл\n"
@@ -1608,7 +1616,7 @@ msgstr ""
 "Специална вградена команда наречена '0' извежда преводите последвани от \n"
 "<NULL> байт.  Резултата от \"msgexec 0\" е подходящ като входящ за \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ PO файл\n"
@@ -1623,27 +1631,27 @@ msgstr "пропадна записването на стандартния из
 msgid "write to %s subprocess failed"
 msgstr "пропадна записването към подпроцес %s "
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "липсва име на филтър"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "трябва да се зададе най-малко един sed скрипт"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЯ] ФИЛТЪР [ФИЛТЪРНА-ОПЦИЯ]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прилагане на филтър към всички преводи от каталога с преводи.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1652,19 +1660,19 @@ msgstr ""
 "ФИЛТЪР може е всяка програма, която чете превод от стандартния вход\n"
 "и записва променения превод на стандартния изход.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Полезни ФИЛТЪР-ОПЦИИ, когато ФИЛТЪР е 'sed':\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=СКРИПТ     добавя СКРИПТ към командите за изпълнение\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1675,7 +1683,7 @@ msgstr ""
 "командите\n"
 "                                за изпълнение\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1683,7 +1691,7 @@ msgstr ""
 "  -n, --quiet, --silent       подтискане на автоматичното извеждане на "
 "пространството от образи\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1691,12 +1699,12 @@ msgstr ""
 "      --no-escape             без използване на Си освобождаващи "
 "последователности в резултата (по подразбиране)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                резултат в стил с отместване\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1715,22 +1723,22 @@ msgid "invalid endianness: %s"
 msgstr "неправилно име за начин на подреждане на байтове: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s изисква указване на \"-d директория\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s изисква указване на \"-l локал\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s е правилен само с %s или %s"
@@ -1780,7 +1788,7 @@ msgstr ""
 "Създаване на двоичен каталог със съобщения от текстово описание на "
 "преводите.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1794,7 +1802,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  имефайл.po ...              входящи файлове\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режими на работа:\n"
@@ -1848,7 +1856,7 @@ msgstr "      --qt                    Qt режим: създаване на Qt
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                разрешава стриктен уеднаквен режим\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ако изходящия файл е -, резултата се записва на стандартния изход.\n"
@@ -1858,13 +1866,13 @@ msgstr "Ако изходящия файл е -, резултата се зап
 msgid "Output file location in Java mode:\n"
 msgstr "Местоположение на резултата при Java режим:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име на ресурс\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1897,7 +1905,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Местоположение на резултата при C# режим:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1920,7 +1928,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Местоположение на резултата при Tcl режим:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1936,7 +1944,7 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .msg файла се записва в указаната\n"
 "директория.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тълкувания за входящия файл:\n"
@@ -2026,7 +2034,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            извежда статистика за преводите\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               увеличава нивото на подробност\n"
@@ -2083,7 +2091,7 @@ msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2094,7 +2102,7 @@ msgstr "%s: предупреждение: файла източник съдър
 msgid "error while reading \"%s\""
 msgstr "грешка при четене на \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2103,7 +2111,7 @@ msgstr ""
 "опцията '%c' не може да се използва преди да се зададе или 'J', или 'K', или "
 "'T', или 'C', или 'X'"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2112,7 +2120,7 @@ msgstr ""
 "Извличане на всички съобщения от каталога с преводи, които съвпадат с даден образ\n"
 "или принадлежат на дадени файлове източници.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2187,7 +2195,7 @@ msgstr ""
 "  -v, --invert-match          извеждане на съобщенията, които не съвпадат със никой\n"
 "                              от критериите за избор\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2195,18 +2203,18 @@ msgstr ""
 "      --escape                резултат с използване на Си освобождаващи "
 "последователности, без разширени знаци\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           резултата да е подреден\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          подреждане на резултата по място на файла\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2216,7 +2224,7 @@ msgstr ""
 "от обкръжението LANG, като е описано в файла ABOUT-NLS.  Това е\n"
 "необходимо, за да се тества превода.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2227,12 +2235,12 @@ msgstr ""
 "Да се зададе локал, чрез опцията --locale или .po файл за резултат, \n"
 "чрез опцията --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Създаден %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2241,12 +2249,12 @@ msgstr ""
 "Създаване на нов PO файл, запълвайки метаинформацията със стойности\n"
 "от потребителското обкръжение.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХФАЙЛ          входящ POT файл\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2256,13 +2264,13 @@ msgstr ""
 "Ако не е зададен входящ файл, текущата директория се претърсва за POT файл.\n"
 "Ако той е -, се чете от стандартния вход.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=ФАЙЛ      записване на резултата в указания PO файл\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2272,19 +2280,19 @@ msgstr ""
 "потребителските настройки за локал.  Ако той е -, резултата се извежда на\n"
 "стандартния изход.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          задаване на целевия локал\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         приема се, че PO файла се създава автоматично\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2292,12 +2300,12 @@ msgstr ""
 "Намерен е повече от един .pot файл.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка при четене на текущата директория"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2305,14 +2313,14 @@ msgstr ""
 "Не е намерен .pot файл в текущата директория.\n"
 "Да се зададе входящ .pot файл с опцията --input.\n"
 
-#: src/msginit.c:900 src/msginit.c:975 src/msginit.c:1135 src/msginit.c:1230
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "пропадна подпроцес %s и излезе с код %d"
 
-#: src/msginit.c:1100
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2330,7 +2338,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1516
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Български превод за пакет %s"
@@ -2368,7 +2376,7 @@ msgstr "целевото кодово множество \"%s\" не е с пр
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
@@ -2618,7 +2626,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "входящия файл не съдържа запис указващ знаково множество"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2637,7 +2645,7 @@ msgstr ""
 "се получиха еднакви."
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2646,16 +2654,16 @@ msgstr ""
 "Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(). Тази "
 "версия е създадена без iconv()."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s е правилно само с %s"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "тип на резервно копие"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2679,18 +2687,18 @@ msgstr ""
 "съвпадение, за получаван на по-добри резултати ще се използват размити\n"
 "(fuzzy) съвпадения\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      преводи препращащи към на старите източници\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     препратки към новите източници\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2700,7 +2708,7 @@ msgstr ""
 "съобщения,\n"
 "                              може да се укаже повече от веднъж\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2709,27 +2717,27 @@ msgstr ""
 "  -U, --update                обнови def.po,\n"
 "                              не прави нищо, ако def.po е осъвременен\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Място на изходящия файл при обновяване:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Резултата се записва обратно в def.po.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛ        създаване на резервно копие на def.po\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=НАСТ           задава наставка за резервно копие\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2747,7 +2755,7 @@ msgstr ""
 "  existing, nil   номериран, ако съществува такъв, иначе обикновен\n"
 "  simple, never   винаги се създава обикновено резервно копие\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2757,7 +2765,7 @@ msgstr ""
 "Наставката за резервно копие е `~', освен ако е зададен с --suffix или с\n"
 "променливата на обкръжението SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2765,23 +2773,23 @@ msgstr ""
 "      --previous              запазване на предишните msgid-ита на "
 "преведените съобщения\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 "  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "това съобщение трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "това съобщение не трябва да зададе форми за множествено число"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2790,30 +2798,30 @@ msgstr ""
 "%sПрочетени %ld стари + %ld препратки, сляти %ld, мъгляви %ld, липсващи %ld, "
 "остаряли %ld.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " готово.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s и изрични имена на файлове са взаимоизключващи се"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Преобразува каталог с двоични съобщения в .po файл каталог с уеднаквен "
 "стил.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2821,12 +2829,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java режим: входящ е Java ResourceBundle клас\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# режим: входящ е .NET .dll файл\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2835,24 +2843,24 @@ msgstr ""
 "      --csharp-resources      C# ресурсен режим: входящ е .NET .resources "
 "файл\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: входящ е tcl/msgcat .msg файл\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ФАЙЛ ...                    входящи .mo файлове\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Местоположение на входящите файлове при Java режим:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2863,12 +2871,12 @@ msgstr ""
 "ресурса,\n"
 "разделени с долна черта.  Класът се намира използвайки CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Местоположение на входящия файл при C# режим:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2877,12 +2885,12 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .dll файла се намира в\n"
 "поддиректория на указаната, чието име зависи от локала.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Местоположение на входящия файл при Tcl режим:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2891,18 +2899,18 @@ msgstr ""
 "Опциите -l и -d са задължителни.  .msg файла се намира в\n"
 "указаната директория.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                записване на резултата в стил с отмествания\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                записване в стриктен уеднаквен стил\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2923,12 +2931,12 @@ msgstr ""
 "като тогава ще се вземат от първия превод. Позициите във файловете ще се натрупат.\n"
 "Ако се използва --unique, повторенията ще се отхвърлят.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              извежда само повторенията\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3073,7 +3081,7 @@ msgstr "край-на-ред в низ"
 msgid "context separator <EOT> within string"
 msgstr "разделител на съдържание <EOT> в низ"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "този файл май не съдържа директиви за област"
@@ -3257,34 +3265,34 @@ msgstr "не можа да се създаде изходящия файл \"%s\
 msgid "standard output"
 msgstr "стандартен изход"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не можа да се създаде директория \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "пропадна компилирането на C# клас, да се опита --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "пропадна компилирането на C# клас"
 
-#: src/write-java.c:1075
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "неправилно име на Java клас: %s"
 
-#: src/write-java.c:1160
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "пропадна компилирането на Java клас, да се опита --verbose или да се "
 "установи $JAVAC"
 
-#: src/write-java.c:1163
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "пропадна компилирането на Java клас, да се опита с установяване $JAVAC"
@@ -3415,7 +3423,7 @@ msgstr "%s:%d: предупреждение: незавършена конста
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавършен заместител на низ"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3518,32 +3526,32 @@ msgstr ""
 "%s:%d: не може да се намери ограничител за край на низ \"%s\" до края на "
 "файла"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: липсва дясна скоба за \\x{ШЕСТНАДЕСЕТИЧНО}"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\l\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\u\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неправилно вмъкване на променлива при \"%c\""
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\L\") на 8-битова буква \"%c\""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\U\") на 8-битова буква \"%c\""
@@ -3642,29 +3650,29 @@ msgstr ""
 "%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за "
 "сигурност, вместо това да се използва eval_gettext"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може да се използва когато резултата се записва на "
 "стандартния изход"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да работи без ключове за търсене"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита C"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извличане на низовете за превод от зададените входящи файлове.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3673,13 +3681,13 @@ msgstr ""
 "  -d, --default-domain=ИМЕ   използване на ИМЕ.po за изходящ (вместо "
 "messages.po)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3687,12 +3695,12 @@ msgstr ""
 "  -p, --output-dir=ДИР        изходящите файлове да се запишат в директория "
 "ДИР\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избиране на език на входящия файл:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3711,12 +3719,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   за краткост на --language=C++\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3725,7 +3733,7 @@ msgstr ""
 "По подразбиране езикът се отгатва в зависимост от окончанието на входящия "
 "файл.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3734,23 +3742,23 @@ msgstr ""
 "      --from-code=NAME        кодиране на входящите файлове\n"
 "                                (без Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "По подразбиране входящите файлове са в ASCII.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         добавя съобщенията към съществуващ файл\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=ФАЙЛ.po  да не се извличат записите от FILE.po\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3763,17 +3771,17 @@ msgstr ""
 "                              отбелязан с БЕЛЕГ (или редовете започващи\n"
 "                              с ключа)\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Опции за определен език:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извличане на всички низове\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3786,7 +3794,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3796,7 +3804,7 @@ msgstr ""
 "означава\n"
 "                              да не се използва ключ по подразбиране )\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3806,7 +3814,7 @@ msgstr ""
 "      --flag=ДУМА:АРГ:ФЛАГ    допълнителен флаг за низове при номер на\n"
 "                              аргумент АРГ за ключ ДУМА\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3819,39 +3827,39 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             разпознаване на ANSI Си тризнаци в входните "
 "данни\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (само езици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    разпознава Qt формат за низове\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (само език C++)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   разпознава KDE 4 формат за низове\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 разпознава Boost формат за низове\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3859,19 +3867,19 @@ msgstr ""
 "      --debug                 по-подробен резултат как е разпознато "
 "съобщението като вид формат\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     записва Java .properties файл\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=НИЗ     задава носител на авторско право в "
 "резултата\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3879,17 +3887,17 @@ msgstr ""
 "      --foreign-user          резултат без авторско право на ФСС за\n"
 "                              чуждестранни потребители\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=ПАКЕТ    задава име на пакет в резултата\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=ВЕРСИЯ   задава версия на паката в резултата\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3897,7 +3905,7 @@ msgstr ""
 "      --msgid-bugs-address=ПОЩА@АДРЕС     задава адрес за рапортуване на "
 "грешки при msgid\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3907,7 +3915,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=НИЗ]     използва НИЗ или \"\" като представка за "
 "msgstr записи\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3917,38 +3925,38 @@ msgstr ""
 "  -M, --msgstr-suffix[=НИЗ]     използва НИЗ или \"\" като наставка за "
 "msgstr записи\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "Аргумента --flag не е с <ключ>:<ном_арг>:[pass-]<флаг> синтаксис: %s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартен изход"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: предупреждение: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3957,7 +3965,7 @@ msgstr ""
 "Макар че е използван в място за низове за формат, %s не е правилен низ за %s "
 "формат. Причина: %s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3966,7 +3974,7 @@ msgstr ""
 "Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: "
 "%s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3979,7 +3987,7 @@ msgstr ""
 "Да се обмисли използването на низ за формат с именувани аргументи и \n"
 "привързване, вместо последователност за аргументите.\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3989,27 +3997,27 @@ msgstr ""
 "gettext(\"\") връща заглавен запис с метаинформация,\n"
 "а не празен низ.\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "двусмислено зададен аргумент за ключ '%.*s'"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "предупреждение: липсва съдържание за ключ '%.*s'"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "предупреждение: липсва съдържание за множествено число на ключ '%.*s'"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Несъответствие на съдържание м/у единствено и множествено число"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4021,7 +4029,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS променлива, иначе се задава\n"
 "опция --msgid-bugs-address на командния ред.\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "непознат език '%s'"

diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index bbd47d5ca05f47ff4385f5c3445ecfb23b3cf06a..5d9c00a62a7ad86efc0464294814869ee9798eac 100644 (file)
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -50,10 +50,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,7 +77,7 @@ msgstr "l’argument %s és ambigu per a %s"
 msgid "Valid arguments are:"
 msgstr "Els arguments vàlids són:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
@@ -84,19 +85,19 @@ msgstr ""
 "TMPDIR"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no s’ha pogut crear un directori temporal amb la plantilla «%s»"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "no s’ha pogut eliminar el fitxer temporal «%s»"
 
 # No usa quote().  ivb
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "no s’ha pogut eliminar el directori temporal «%s»"
@@ -105,44 +106,44 @@ msgstr "no s’ha pogut eliminar el directori temporal «%s»"
 msgid "write error"
 msgstr "error d’escriptura"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error en obrir «%s» per a llegir"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "no s’ha pogut obrir el fitxer còpia de seguretat «%s» per a escriure"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error en escriure «%s»"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error després d’haver llegit «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "ha fallat fdopen()"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "no s’ha trobat cap compiŀlador de C#, instaŀleu «pnet»"
@@ -153,74 +154,73 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr "no s’ha trobat cap màquina virtual de C#, instaŀleu «pnet»"
 
 # Amb el mateix format que els errors de la libc.  ivb
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "el subprocés «%s» ha fallat"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: l’opció «%s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l’opció «%s» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: l’opció «--%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: l’opció «%c%s» no és reconeguda\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: no es permet l’opció «%c»\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: l’opció «%c» no és vàlida\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l’opció «%c» necessita un argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l’opció «-W %s» és ambígua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l’opció «%s» necessita un argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -232,20 +232,20 @@ msgstr "l’argument «source_version» passat a compile_java_class() no és và
 msgid "invalid target_version argument to compile_java_class"
 msgstr "l’argument «target_version» passat a compile_java_class() no és vàlid"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "no s’ha pogut crear «%s»"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error en escriure el fitxer «%s»"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -259,20 +259,20 @@ msgstr ""
 "no s’ha trobat cap màquina virtual de Java, instaŀleu «gij» o establiu la "
 "variable d’entorn JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error d’E/S amb el subprocés «%s»"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -291,37 +291,37 @@ msgstr "no s’ha pogut crear una canonada"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "«"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "»"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle() ha fallat amb el codi d’error 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ha fallat _open_osfhandle()"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocés «%s»"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
@@ -330,40 +330,39 @@ msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgstr» o «msgstr[n]».  ivb
 # El motiu està traduït.  ivb
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "«%s» no és una cadena vàlida de format de %s, com la de «msgid».  Motiu: %s"
 
 # «%s» és «msgstr».  ivb
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"no existeix, com en «%2$s», una especificació de format de l’argument %1$u en "
-"«msgid»"
+"no existeix, com en «%2$s», una especificació de format de l’argument %1$u "
+"en «msgid»"
 
 # «%s» és «msgstr».  ivb
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument %u en «%s»"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "les especificacions de format en «msgid» i «%s» de l’argument %u no són les "
 "mateixes"
@@ -396,9 +395,9 @@ msgstr ""
 "La cadena es refereix a l’argument número %u però passa per alt l’argument "
 "número %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el nombre d’especificacions de format en «msgid» i «%s» no coincideix"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -443,18 +442,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La cadena conté un «}» solt després de la directiva número %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "A la directiva número %u, la combinació d’indicadors no és vàlida."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "A la directiva número %u, no es pot especificar la precisió abans de «%c»."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -463,7 +462,7 @@ msgstr ""
 "A la directiva número %u, el número d’argument per a la precisió ha de ser "
 "igual a %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -471,24 +470,24 @@ msgid ""
 msgstr ""
 "A la directiva número %u, no es pot especificar la precisió abans de «%c»."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "A la directiva número %u, l’especificació de precisió no és vàlida."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "A la directiva número %u, no es permeten indicadors abans de «%c»."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "«msgid» empra %%m però «%s» no ho fa"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "«msgid» no empra %%m però «%s» empra %%m"
 
 #: src/format-invalid.h:22
@@ -557,7 +556,8 @@ msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"A la directiva número %u, la subcadena «%s» no té un estil de data/hora vàlid."
+"A la directiva número %u, la subcadena «%s» no té un estil de data/hora "
+"vàlid."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -592,30 +592,29 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"A la directiva número %u, una selecció («choice») conté un número que no està "
-"seguit per «<», «#» o «%s»."
+"A la directiva número %u, una selecció («choice») conté un número que no "
+"està seguit per «<», «#» o «%s»."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"no existeix una especificació de format de l’argument {%u} en «msgid», com en "
-"«%s»"
+"no existeix una especificació de format de l’argument {%u} en «msgid», com "
+"en «%s»"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument {%u} en «%s»"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"les especificacions de format de l’argument {%2$u} en «msgid» i «%1$s» no són "
-"les mateixes"
+"les especificacions de format de l’argument {%2$u} en «msgid» i «%1$s» no "
+"són les mateixes"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -630,14 +629,14 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
-"A la directiva número %u, s’han especificat massa paràmetres; se n’esperava %"
-"u com a molt."
+"A la directiva número %u, s’han especificat massa paràmetres; se n’esperava "
+"%u com a molt."
 msgstr[1] ""
 "A la directiva número %u, s’han especificat massa paràmetres; se n’esperaven "
 "%u com a molt."
@@ -668,7 +667,8 @@ msgstr "S’ha trobat «~%c» sense el «~%c» corresponent."
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
-"A la directiva número %u, s’han especificat tant el modificador «@» com el «:»."
+"A la directiva número %u, s’han especificat tant el modificador «@» com el "
+"«:»."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -676,8 +676,8 @@ msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"A la directiva número %u, «~[» no està seguit de dues clàusules separades per "
-"«~;»."
+"A la directiva número %u, «~[» no està seguit de dues clàusules separades "
+"per «~;»."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
@@ -689,13 +689,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "La cadena es refereix a algun argument de formes incompatibles."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "les especificacions de format en «msgid» i «%s» no són equivalents"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "les especificacions de format de «%s» no són un subconjunt de les de «msgid»"
 
@@ -708,12 +708,12 @@ msgstr ""
 "A la directiva número %u, l’especificador de mida no és compatible amb "
 "l’especificador de conversió «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument «%s» en «%s»"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -721,55 +721,52 @@ msgstr ""
 "La subcadena es refereix a arguments tant pel seu nom com per "
 "especificacions d’argument sense nom."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "les especificacions de format de «msgid» necessiten un mapa, les de «%s» una "
 "tupla"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"les especificacions de format de «msgid» necessiten una tupla, les de «%s» un "
-"mapa"
+"les especificacions de format de «msgid» necessiten una tupla, les de «%s» "
+"un mapa"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
-"no existeix una especificació de format de l’argument «%s» en «msgid», com en «%"
-"s»"
+"no existeix una especificació de format de l’argument «%s» en «msgid», com "
+"en «%s»"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"les especificacions de format de l’argument «%2$s» en «msgid» i «%1$s» no són "
-"les mateixes"
+"les especificacions de format de l’argument «%2$s» en «msgid» i «%1$s» no "
+"són les mateixes"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
-"«msgid» és una cadena de format simple, però «%s» no ho és: conté un indicador "
-"«L» o un número d’argument amb un dígit doble"
+"«msgid» és una cadena de format simple, però «%s» no ho és: conté un "
+"indicador «L» o un número d’argument amb un dígit doble"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -810,11 +807,11 @@ msgid ""
 msgstr ""
 "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -827,38 +824,38 @@ msgstr ""
 "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"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ]\n"
@@ -893,29 +890,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address     Adreces corresponents al nom d’estació.\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
@@ -924,11 +921,11 @@ msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -937,30 +934,30 @@ msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "no s’ha pogut obtenir el nom d’estació"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "es permet com a molt un fitxer d’entrada"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "«%s» i «%s» són mútuament excloents"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -969,10 +966,10 @@ msgstr ""
 "Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
 "manipula aquests atributs.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -980,23 +977,23 @@ msgstr ""
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ubicació del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1005,34 +1002,34 @@ msgstr ""
 "                       Afegeix el DIRECTORI a la llista de cerca de fitxers\n"
 "                       d’entrada.\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no s’especifica cap fitxer d’entrada, o si aquest és «-», es llegirà\n"
 "l’entrada estàndard.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ubicació del fitxer d’eixida:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer especificat.\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1042,12 +1039,12 @@ msgstr ""
 "fitxer\n"
 "d’eixida, o si aquest és «-».\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecció dels missatges:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1055,7 +1052,7 @@ msgstr ""
 "      --translated     Manté els missatges traduïts, elimina els no "
 "traduïts.\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1063,53 +1060,53 @@ msgstr ""
 "      --untranslated    Manté els missatges no traduïts, elimina els "
 "traduïts.\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy       Elimina els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy     Manté els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete    Elimina els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete    Manté els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulació dels atributs:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy      Marca tots els missatges com a «fuzzy».\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy    Marca tots els missatges com a no‐«fuzzy».\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete    Marca tots els missatges com a obsolets.\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete    Marca tots els missatges com a no obsolets.\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1118,7 +1115,7 @@ msgstr ""
 "      --clear-previous    Elimina de tots els missatges el comentari amb el\n"
 "                       «msgid» anterior.\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1127,7 +1124,7 @@ msgstr ""
 "                       Només manipula les entrades llistades al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1137,27 +1134,27 @@ msgstr ""
 "po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy          Equival a «--only-fuzzy --clear-fuzzy».\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxi del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1167,8 +1164,8 @@ msgstr ""
 "de\n"
 "                       Java.\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1178,17 +1175,43 @@ msgstr ""
 "                       El fitxer d’entrada segueix la sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalls de l’eixida:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color          Sempre empra colors i altres atributs per al text.\n"
+"      --color=QUAN     Controla quan s’empren colors i altres atributs per "
+"al\n"
+"                       text. QUAN pot ser: «always», «never», «auto» o "
+"«html»\n"
+"                       (sempre, mai, automàtic, HTML).\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=FITXER    Empra el fitxer indicat de full d’estil CSS per a\n"
+"                        «--color».\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1196,9 +1219,9 @@ msgstr ""
 "  -e, --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1206,27 +1229,27 @@ msgstr ""
 "  -E, --escape         Empra seqüències d’escapada de C a l’eixida, en lloc\n"
 "                       de caràcters estesos.\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po       Genera el fitxer PO encara que estiga buit.\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1234,8 +1257,8 @@ msgstr ""
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1243,18 +1266,18 @@ msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1263,16 +1286,16 @@ msgstr ""
 "                       Genera un fitxer amb sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=AMPLADA    Estableix l’amplada de pàgina de l’eixida.\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1281,27 +1304,27 @@ msgstr ""
 "      --no-wrap        No parteix les línies de missatge més llargues que\n"
 "                       l’amplada de pàgina.\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "s’ha especificat un criteri de selecció impossible (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1309,7 +1332,7 @@ msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
 # ivb (2001/12/24)
 # ivb  Aquesta traducció no és completament literal però queda més clar.
 # ivb  Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1332,25 +1355,25 @@ msgstr ""
 "treuran del primer fitxer PO que els definesca.  Les posicions de fitxer de\n"
 "tots els fitxers PO s’acumularan.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FITXER_ENTRADA…      Fitxers d’entrada.\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FITXER\n"
 "                       Obté la llista de fitxers d’entrada del FITXER.\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1360,7 +1383,7 @@ msgstr ""
 "                       Escriu els missatges amb menys de NÚMERO definicions\n"
 "                       (per defecte infinites).\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1371,7 +1394,7 @@ msgstr ""
 "(per\n"
 "                       defecte 0).\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1381,8 +1404,8 @@ msgstr ""
 "s’escriguen\n"
 "                       els missatges únics.\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1392,8 +1415,8 @@ msgstr ""
 "properties»\n"
 "                       de Java.\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1404,12 +1427,12 @@ msgstr ""
 "de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOM    Codificació de l’eixida.\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1419,48 +1442,33 @@ msgstr ""
 "mescla\n"
 "                       diverses traduccions.\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --color          Sempre empra colors i altres atributs per al text.\n"
-"      --color=QUAN     Controla quan s’empren colors i altres atributs per "
-"al\n"
-"                       text. QUAN pot ser: «always», «never», «auto» o «html»\n"
-"                       (sempre, mai, automàtic, HTML).\n"
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=FITXER    Empra el fitxer indicat de full d’estil CSS per a\n"
-"                        «--color».\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cal que especifiqueu exactament dos fitxers d’entrada"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Forma d’ús: %s [OPCIÓ] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1478,79 +1486,87 @@ msgstr ""
 "es puga trobar una coincidència exacta, s’emprarà una comparació difusa per a\n"
 "produir uns diagnòstics millors.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po               Traduccions.\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot              Referències al codi font.\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadors del funcionament:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
-"  -m, --multi-domain    Aplica «ref.pot» a cadascun dels dominis de «def.po».\n"
+"  -m, --multi-domain    Aplica «ref.pot» a cadascun dels dominis de «def."
+"po».\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+"  -N, --no-fuzzy-matching\n"
+"                       No empra la comparació difusa.\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy      Té en compte les entrades difuses.\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --use-untranslated\n"
 "                       Té en compte les entrades no traduïdes.\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "aquest missatge no està traduït"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "aquest missatge ha de ser revisat pel traductor"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "aquest missatge s’empra però no s’ha definit…"
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "…però aquesta definició és similar"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s’empra"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s’ha trobat %d error fatal"
 msgstr[1] "s’han trobat %d errors fatals"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cal que especifiqueu almenys dos fitxers"
@@ -1558,7 +1574,7 @@ msgstr "cal que especifiqueu almenys dos fitxers"
 # ivb (2001/12/24)
 # ivb  Aquesta traducció no és completament literal però queda més clar.
 # ivb  Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1579,7 +1595,7 @@ msgstr ""
 "que els definesca.  Les posicions de fitxer de tots els fitxers PO\n"
 "s’acumularan.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1590,43 +1606,43 @@ msgstr ""
 "(per\n"
 "                       defecte 1).\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header    No escriu la capçalera amb l’entrada «msgid \"\"».\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Converteix un catàleg de traduccions a una codificació de caràcters "
 "diferent.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Objectiu de la conversió:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "La codificació per defecte és la del locale actual.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1634,30 +1650,30 @@ msgstr ""
 "      --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "cal que especifiqueu exactament un fitxer d’entrada"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FITXER_ENTRADA\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1670,22 +1686,22 @@ msgstr ""
 "amb «xgettext»).  S’assignarà a les entrades no traduïdes una traducció igual\n"
 "al «msgid» corresponent.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FITXER_ENTRADA       Fitxer d’entrada PO o POT.\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "manca el nom d’una ordre"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] ORDRE [OPCIÓ_D’ORDRE]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1700,7 +1716,7 @@ msgstr ""
 "esdevé l’eixida de «msgexec».  El codi de retorn de «msgexec» és el codi màxim\n"
 "de totes les invocacions del programa.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1709,44 +1725,44 @@ msgstr ""
 "L’ordre incorporada «0» genera la traducció seguida d’un octet nul.  L’eixida\n"
 "de «msgexec 0» és adequada com a entrada per a «xargs -0».\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=FITXER_ENTRADA\n"
 "                       Fitxer PO d’entrada.\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "no s’ha pogut escriure a l’eixida estàndard"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "no s’ha pogut escriure al subprocés «%s»"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "manca el nom d’un filtre"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cal que especifiqueu almenys un guió de «sed»"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Forma d’ús: %s [OPCIÓ] FILTRE [OPCIÓ_DE_FILTRE]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplica un filtre a cada traducció d’un catàleg de traduccions.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1755,18 +1771,18 @@ msgstr ""
 "El FILTRE pot ser qualsevol programa que llija una traducció de l’entrada\n"
 "estàndard i n’escriga una de modificada a l’eixida estàndard.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPCIONS_DE_FILTRE útils quan el FILTRE és «sed»:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=GUIÓ    Afegeix el GUIÓ a les ordres a executar.\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1778,7 +1794,7 @@ msgstr ""
 "a\n"
 "                       executar.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1786,7 +1802,7 @@ msgstr ""
 "  -n, --quiet, --silent    Evita la impressió automàtica de l’espai de "
 "patró.\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1794,12 +1810,12 @@ msgstr ""
 "      --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1807,105 +1823,87 @@ msgstr ""
 "      --keep-header    Manté intacta l’entrada de capçalera, sense filtrar‐"
 "la.\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Encara no s’ha implementat."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "no s’ha pogut establir una E/S no blocadora amb el subprocés «%s»"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "la comunicació amb el subprocés «%s» ha fallat"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "no s’ha pogut llegir del subprocés «%s»"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "l’argument de «%s» ha de ser un sol caràcter de puntuació"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "l’ordenació d’octets «%s» no és vàlida"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "«%s» necessita una especificació «-d directori»"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "«%s» necessita una especificació «-l locale»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "«%s» només és vàlida amb «%s» o «%s»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "«%s» només és vàlida amb «%s», «%s» o «%s»"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d missatge traduït"
 msgstr[1] "%d missatges traduïts"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducció difusa"
 msgstr[1] ", %d traduccions difuses"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d missatge no traduït"
 msgstr[1] ", %d missatges no traduïts"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] nom_fitxer.po…\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catàleg binari de missatges partint d’una descripció textual de\n"
 "traduccions.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1914,17 +1912,17 @@ msgstr ""
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.  El mateix ocorre amb els arguments opcionals.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nom_fitxer.po…       Fitxers d’entrada.\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1933,7 +1931,7 @@ msgstr ""
 "  -j, --java           Mode Java: genera una classe «ResourceBundle» de "
 "Java.\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1942,13 +1940,13 @@ msgstr ""
 "      --java2          Com «--java», però assumeix Java2 (JDK 1.2 o "
 "superior).\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp         Mode C#: genera un fitxer «.dll» de .NET.\n"
 
 # Els recursos són cosa de la plataforma .NET, no només de C#.  ivb
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1960,7 +1958,7 @@ msgstr ""
 "                       .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1968,35 +1966,35 @@ msgstr ""
 "      --tcl            Mode Tcl: genera un fitxer «.msg» per a «msgcat» de\n"
 "                       Tcl.\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt             Mode Qt: genera un fitxer «.qm» de Qt.\n"
 
 # Ull!  En aquest cas no és un fitxer PO!  ivb
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fitxer d’eixida és «-» s’escriurà a l’eixida estàndard.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURS    Nom del recurs.\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2004,7 +2002,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCALE    Nom del locale, bé «idioma» o bé «idioma_PAÍS».\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2012,7 +2010,7 @@ msgstr ""
 "  -d DIRECTORI         Directori base de la jerarquia de directoris de les\n"
 "                       classes.\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2025,12 +2023,12 @@ msgstr ""
 "separats per un caràcter de subratllat.  L’opció «-d» és obligatòria.  La\n"
 "classe s’escriurà sota el directori especificat.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2039,42 +2037,44 @@ msgstr ""
 "  -d DIRECTORI         Directori base dels fitxers «.dll» dependents del\n"
 "                       locale.\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.dll» s’escriurà sota un\n"
+"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.dll» s’escriurà sota "
+"un\n"
 "subdirectori del directori especificat.  El nom del subdirectori depén del\n"
 "locale.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORI         Directori base dels catàlegs «.msg» de missatges.\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
-"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.msg» s’escriurà sota el\n"
+"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.msg» s’escriurà sota "
+"el\n"
 "directori especificat.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretació del fitxer d’entrada:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2082,17 +2082,18 @@ msgid ""
 "domain\n"
 msgstr ""
 "  -c, --check          Realitza totes les comprovacions implicades per\n"
-"                       «--check-format», «--check-header» i «--check-domain».\n"
+"                       «--check-format», «--check-header» i «--check-"
+"domain».\n"
 
 # Segons la doc, quan ací diu «language» es refereix a un de programació.  ivb
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format    Comprova les cadenes de format dependents del\n"
 "                       llenguatge de programació.\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2102,7 +2103,7 @@ msgstr ""
 "                       capçalera.\n"
 
 # La directiva s’anomena «domain».  ivb
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2111,7 +2112,7 @@ msgstr ""
 "      --check-domain    Comprova si hi ha conflictes entre les directives\n"
 "                       «domain» i l’opció «--output-file».\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2121,7 +2122,7 @@ msgstr ""
 "                       Comprova si el «msgfmt» de GNU es comporta com el\n"
 "                       «msgfmt» d’X/Open.\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2132,12 +2133,12 @@ msgstr ""
 "                       Comprova la presència d’acceleradors de teclat per a\n"
 "                       ítems de menú.\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy      Empra a l’eixida les entrades difuses.\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2145,7 +2146,7 @@ msgstr ""
 "  -a, --alignment=NÚMERO\n"
 "                       Alinea les cadenes a NÚMERO octets (%d per defecte).\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2153,87 +2154,88 @@ msgstr ""
 "      --no-hash        Fa que el fitxer binari no incloga la taula de\n"
 "                       dispersió.\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics     Mostra estadístiques sobre les traduccions.\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose        Augmenta el nivell de descripció.\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avís: la conversió del joc de caràcters no funcionarà\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avís: la capçalera del fitxer PO està marcada com a difusa\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nom de domini «%s» no és adequat com a nom de fitxer: se n’emprarà un "
 "prefix"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "es descarta la directiva «domain %s»"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» buida"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» difusa"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avís: el fitxer font conté una traducció difusa"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
-msgstr "no es pot emprar l’opció «%c» abans d’especificar «J», «K», «T», «C» o «X»"
+msgstr ""
+"no es pot emprar l’opció «%c» abans d’especificar «J», «K», «T», «C» o «X»"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2242,7 +2244,7 @@ msgstr ""
 "Extrau d’un catàleg de traduccions tots els missatges que concorden amb\n"
 "un patró especificat o que pertanyen a uns fitxers font indicats.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2323,7 +2325,7 @@ msgstr ""
 "  -v, --invert-match    Només tria els missatges que no concorden amb cap\n"
 "                       criteri de selecció.\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2332,19 +2334,19 @@ msgstr ""
 "de\n"
 "                       caràcters estesos.\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2356,7 +2358,7 @@ msgstr ""
 "vostres traduccions.\n"
 
 # Multilínia.  ivb
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2367,12 +2369,12 @@ msgstr ""
 "Per favor, especifiqueu el locale mitjançant l’opció «--locale» o el\n"
 "fitxer PO d’eixida mitjançant l’opció «--output-file».\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "S’ha creat «%s».\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2381,14 +2383,14 @@ msgstr ""
 "Crea un fitxer PO nou, inicialitzant‐ne la metainformació amb valors obtesos\n"
 "de l’entorn de l’usuari.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 "  -i, --input=FITXER_ENTRADA\n"
 "                       Fitxer POT d’entrada.\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2399,14 +2401,14 @@ msgstr ""
 "directori\n"
 "actual.  Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer PO especificat.\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2418,13 +2420,13 @@ msgstr ""
 "s’escriuran a l’eixida estàndard.\n"
 
 # Espere que s’entenga…  ivb
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 "  -l, --locale=ii_PP    Estableix el locale objectiu (idioma i país).\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2432,7 +2434,7 @@ msgstr ""
 "      --no-translator    Assumeix que el fitxer PO és generat "
 "automàticament.\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2440,13 +2442,13 @@ msgstr ""
 "S’ha trobat més d’un fitxer «.pot».\n"
 "Per favor, especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error en llegir el directori actual"
 
 # Multilínia.  ivb
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2454,15 +2456,15 @@ msgstr ""
 "No s’ha trobat cap fitxer «.pot» al directori actual.  Per favor,\n"
 "especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "el subprocés «%s» ha fallat amb codi d’eixida %d"
 
 # Aquest missatge va directament per pantalla…  ivb
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2480,22 +2482,22 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduccions al català del paquet «%s»"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "el joc de caràcters actual, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "el fitxer d’entrada conté dos jocs de caràcters distints, «%s» i «%s»"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2503,30 +2505,30 @@ msgstr ""
 "el fitxer d’entrada «%s» no conté una entrada de capçalera amb una "
 "especificació de joc de caràcters"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"el domini «%s» del fitxer d’entrada «%s» no conté una entrada de capçalera amb "
-"una especificació de joc de caràcters"
+"el domini «%s» del fitxer d’entrada «%s» no conté una entrada de capçalera "
+"amb una especificació de joc de caràcters"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "el joc de caràcters destinació, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "avís: "
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2536,7 +2538,7 @@ msgstr ""
 "«UTF-8» entre altres.  Es convertirà l’eixida a «UTF-8».\n"
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2550,7 +2552,7 @@ msgstr ""
 "codificació, useu l’opció «--to-code».\n"
 
 # Multilínia.  ivb
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2565,7 +2567,7 @@ msgstr ""
 "codi font.\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2579,13 +2581,13 @@ msgstr ""
 "Aquestes són unes solucions possibles:\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "— Establiu LC_ALL a un locale amb codificació «%s».\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2597,7 +2599,7 @@ msgstr ""
 "  i aleshores torneu‐lo a convertir en «%s» amb «msgconv».\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2611,7 +2613,7 @@ msgstr ""
 "  i aleshores torneu‐lo a convertir en «%s» amb «msgconv».\n"
 
 # Multilínia.  ivb
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2625,26 +2627,26 @@ msgstr ""
 # ivb (2002/01/03)
 # ivb  En aquestes frases, tant «nplurals» com «plural» es refereixen a
 # ivb  variables del camp «Plural-Forms» de la capçalera.
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "l’expressió de «plural» pot produir valors negatius"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
-"«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a %"
-"lu"
+"«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a "
+"%lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "l’expressió de «plural» pot produir una divisió entre zero"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "l’expressió de «plural» pot produir un desbordament enter"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2656,51 +2658,51 @@ msgstr ""
 # ivb  El «%s» es refereix a un idioma, i tot el missatge recomana usar una
 # ivb  entrada de capçalera «Plural-Forms:».
 # L’idioma és el de «Language-Team» (en anglés).  ivb
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Proveu d’emprar açò, vàlid per a l’idioma «%s»:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "el catàleg de missatges té traduccions amb forma plural"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "però l’atribut «plural=EXPRESSIÓ» manca a l’entrada de capçalera"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "però l’atribut «nplurals=ENTER» manca a l’entrada de capçalera"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "el valor d’«nplurals» no és vàlid"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "l’expressió de «plural» no és vàlida"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "«nplurals» és %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "però alguns missatges només tenen una forma plural"
 msgstr[1] "però alguns missatges només tenen %lu formes plurals"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "però alguns missatges tenen una forma plural"
 msgstr[1] "però alguns missatges tenen %lu formes plurals"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2708,84 +2710,85 @@ msgstr ""
 "el catàleg de missatges té traduccions amb forma plural, però hi manca una "
 "entrada de capçalera amb «Plural-Forms: nplurals=ENTER; plural=EXPRESSIÓ;»"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no comencen per «\\n»"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no comencen per «\\n»"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no acaben en «\\n»"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no acaben en «\\n»"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "sobren marques d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "manca el camp de capçalera «%s» a la capçalera\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "cal que el camp de capçalera «%s» comence a l’inici de la línia\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "el camp «%s» encara té el valor inicial per defecte\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: l’entrada no és vàlida segons la codificació «%s»"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error en convertir de la condificació «%s» a la codificació «%s»"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "el fitxer d’entrada no conté una entrada de capçalera amb una especificació "
 "de joc de caràcters"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2795,7 +2798,7 @@ msgstr ""
 "permet l’ús d’aquesta conversió."
 
 # Es refereix a quelcom que _ha_ocorregut_.  ivb
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2804,28 +2807,28 @@ msgstr ""
 "La conversió de «%s» a «%s» crea duplicats: alguns msgid diferents esdevenen "
 "iguals."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"No es pot convertir de «%s» a «%s».  «%s» es basa en iconv().  Aquesta versió "
-"ha estat construïda sense iconv()."
+"No es pot convertir de «%s» a «%s».  «%s» es basa en iconv().  Aquesta "
+"versió ha estat construïda sense iconv()."
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "«%s» només és vàlida amb «%s»"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipus de còpia de seguretat"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2849,17 +2852,17 @@ msgstr ""
 "Quan no es puga trobar una coincidència exacta s’emprarà una comparació difusa\n"
 "per a produir uns resultats millors.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po               Traduccions referents al codi font antic.\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot              Referències al nou codi font.\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2870,38 +2873,39 @@ msgstr ""
 "es\n"
 "                       pot especificar diverses voltes.\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update         Actualitza «def.po», no fa res si «def.po» ja es troba\n"
+"  -U, --update         Actualitza «def.po», no fa res si «def.po» ja es "
+"troba\n"
 "                       actualitzat.\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode d’actualització:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "El resultat es torna a escriure sobre «def.po».\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL    Crea una còpia de seguretat de «def.po».\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFIX    Substitueix el sufix habitual de còpia de "
 "seguretat.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2922,41 +2926,35 @@ msgstr ""
 "                   simples en cas contrari.\n"
 "  simple, never    Fa còpies de seguretat simples sempre.\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"El sufix de còpia de seguretat és «~», si no s’estableix amb «--suffix» o amb\n"
+"El sufix de còpia de seguretat és «~», si no s’estableix amb «--suffix» o "
+"amb\n"
 "la variable d’entorn SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching\n"
-"                       No empra la comparació difusa.\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous       Manté els «msgid» anteriors dels missatges traduïts.\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent    No mostra els indicadors de progrés.\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "cal definir formes plurals d’aquest missatge"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "no s’han de definir formes plurals d’aquest missatge"
@@ -2965,38 +2963,40 @@ msgstr "no s’han de definir formes plurals d’aquest missatge"
 # ivb  Pense que «aprofitades» queda més clar que «mesclades»; es refereix
 # ivb  a les traduccions obteses directament de «def.po».  El primer «%s» és
 # ivb  (o no) una nova línia.
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sS’han llegit %ld traduccions antigues + %ld referències, %ld aprofitades, %"
-"ld difuses, %ld mancants, %ld obsoletes.\n"
+"%sS’han llegit %ld traduccions antigues + %ld referències, %ld aprofitades, "
+"%ld difuses, %ld mancants, %ld obsoletes.\n"
 
 # ivb (2002/01/08)
 # ivb  Indica el final del processament, el gènere i nombre no són importants.
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " fet.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "«%s» i els noms explícits de fitxer són mútuament excloents"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER]…\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Converteix un catàleg binari de missatges en un fitxer PO d’estil Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -3006,14 +3006,14 @@ msgstr ""
 "de\n"
 "                       Java.\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp         Mode C#: l’entrada és un fitxer «.dll» de .NET.\n"
 
 # Els recursos són cosa de la plataforma .NET, no només de C#.  ivb
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -3024,25 +3024,26 @@ msgstr ""
 "                       «.resources» de .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl            Mode Tcl: l’entrada és un fitxer «.msg» per a «msgcat»\n"
+"      --tcl            Mode Tcl: l’entrada és un fitxer «.msg» per a "
+"«msgcat»\n"
 "                       de Tcl.\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FITXER…              Fitxers MO d’entrada.\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Ubicació del fitxer d’entrada al mode Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -3055,28 +3056,29 @@ msgstr ""
 "el\n"
 "camí a les classes, CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Ubicació del fitxer d’entrada al mode C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.dll» es trobarà en un\n"
+"Les opcions «-l» i «-d» són obligatòries.  El fitxer «.dll» es trobarà en "
+"un\n"
 "subdirectori del directori especificat.  El nom del subdirectori dependrà "
 "del\n"
 "locale.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Ubicació del fitxer d’entrada al mode Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3085,19 +3087,19 @@ msgstr ""
 "Les opcions «-l» i «-d» són obligatòries.  El fitxer «.msg» es trobarà al\n"
 "directori especificat.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3119,12 +3121,12 @@ msgstr ""
 "de la primera traducció.  Les posicions de fitxer s’acumularan.  Quan useu\n"
 "l’opció «--unique» es descartaran els duplicats.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated       Només mostra els missatges duplicats.\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3133,7 +3135,7 @@ msgstr ""
 "  -u, --unique         Només mostra els missatges únics, descartant els\n"
 "                       duplicats.\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<entrada estàndard>"
@@ -3227,67 +3229,67 @@ msgstr "la primera forma plural no té índex zero"
 msgid "plural form has wrong index"
 msgstr "la forma plural té un índex incorrecte"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "hi ha massa errors, s’avorta"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "la seqüència multioctet no és vàlida"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "hi ha una seqüència multioctet incompleta al final del fitxer"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "hi ha una seqüència multioctet incompleta al final de la línia"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "ha fallat iconv()"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la paraula clau «%s» no és coneguda"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "la seqüència de control no és vàlida"
 
 # S’indica la posició exacta de la cadena.  ivb
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "s’ha trobat el final de fitxer emmig de la cadena"
 
 # S’indica la posició exacta de la cadena.  ivb<
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "s’ha trobat un final de línia emmig de la cadena"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "s’ha trobat un separador de context «EOT» enmig de la cadena"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "la definició del missatge és duplicada"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "aquesta és la ubicació de la primera definició"
 
@@ -3375,17 +3377,17 @@ msgstr "l’entrada no és vàlida segons la codificació «%s»"
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error en convertir de la condificació «%s» a la codificació «%s»"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "calen dos arguments"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Forma d’ús: %s [OPCIÓ] URL FITXER\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3394,11 +3396,26 @@ msgstr ""
 "Obté i mostra el contingut d’una URL.  Si no es pot accedir a la URL,\n"
 "s’emprarà el FITXER accessible localment en lloc d’aquella.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error en escriure a l’eixida estàndard"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3441,43 +3458,43 @@ msgstr ""
 "El catàleg de missatges té traduccions amb forma plural, però el format "
 "d’eixida no en permet l’ús."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "eixida estàndard"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "no s’ha pogut crear el directori «%s»"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "no s’ha pogut compiŀlar la classe C#, per favor useu «--verbose»"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "no s’ha pogut compiŀlar la classe C#"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "«%s» no és un nom vàlid de classe Java"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"no s’ha pogut compiŀlar la classe Java, per favor useu «--verbose» o establiu "
-"la variable d’entorn JAVAC"
+"no s’ha pogut compiŀlar la classe Java, per favor useu «--verbose» o "
+"establiu la variable d’entorn JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3489,7 +3506,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "error en obrir «%s» per a escriure"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3498,7 +3515,7 @@ msgstr ""
 "«%c»"
 
 # Multilínia.  ivb
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3512,7 +3529,7 @@ msgstr ""
 "%s\n"
 
 # Multilínia.  ivb
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3538,8 +3555,8 @@ msgstr ""
 # Multilínia.  ivb
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3565,7 +3582,7 @@ msgid "error while writing to %s subprocess"
 msgstr "error en escriure al subprocés «%s»"
 
 # Multilínia.  ivb
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3574,7 +3591,7 @@ msgstr ""
 "el format «.resources» de C# no permet l’ús de contexts.\n"
 
 # Multilínia.  ivb
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3601,39 +3618,37 @@ msgstr ""
 "format de catàleg de missatges de Tcl no permet el tractament de\n"
 "plurals.\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avís: la cadena no està terminada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avís: l’expressió regular no està terminada"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avís: la constant caràcter no està terminada"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no està terminat"
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Hi ha una cadena no‐ASCII en «%s%s».\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3644,7 +3659,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3654,7 +3669,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3664,7 +3679,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3674,13 +3689,13 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # La funció.  ivb
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ha fallat iconv()"
 
 # Multilínia.  ivb
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3689,34 +3704,34 @@ msgstr ""
 "%s:%d: La seqüència multioctet no és vàlida.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: avís: la constant cadena no està terminada"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: avís: s’ha trobat «)» on s’esperava «}»"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
 
 # Crec que no hauria de tenir traducció.  ivb
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
 # Multilínia.  L’argument és el nom del programa.  ivb
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3725,58 +3740,57 @@ msgstr ""
 "No es permet l’ús del llenguatge «glade».  «%s» fa ús d’«expat».\n"
 "Aquesta versió ha estat construïda sense «expat».\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: no s’ha trobat el terminador de cadena «%s» abans del final de fitxer"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: manca la clau dreta de «\\x{NÚMERO_HEX}»"
 
 # Sembla que «interpolació» és una expressió pròpia de Perl. ivb
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: la interpolació «\\l» del caràcter de 8 bits «%c» no és vàlida"
 
 # Sembla que «interpolació» és una expressió pròpia de Perl. ivb
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: la interpolació «\\u» del caràcter de 8 bits «%c» no és vàlida"
 
 # Sembla que «interpolació» és una expressió pròpia de Perl. ivb
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: la interpolació de variable amb «%c» no és vàlida"
 
 # Sembla que «interpolació» és una expressió pròpia de Perl. ivb
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: la interpolació «\\L» del caràcter de 8 bits «%c» no és vàlida"
 
 # Sembla que «interpolació» és una expressió pròpia de Perl. ivb
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: la interpolació «\\U» del caràcter de 8 bits «%c» no és vàlida"
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3786,7 +3800,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3800,7 +3814,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3813,7 +3827,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3826,7 +3840,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3839,7 +3853,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3852,28 +3866,28 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # No multilínia.  ivb
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "la codificació «%s» no és coneguda, s’emprarà ASCII al seu lloc"
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: la definició de cadena no és vàlida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: manca un número després de «#»"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: l’expressió de cadena no és vàlida"
 
 # És una funció d’intèrpret.  ivb
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3882,29 +3896,29 @@ msgstr ""
 "%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
 "useu «eval_gettext» al seu lloc"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "no es pot emprar «--join-existing» quan s’escriu a l’eixida estàndard"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "avís: l’extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb el "
 "llenguatge «C»"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extreu les cadenes traduïbles dels fitxers d’entrada indicats.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3914,12 +3928,12 @@ msgstr ""
 "                       Empra «NOM.po» com a eixida (en lloc de «messages."
 "po»).\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FITXER    Escriu l’eixida al FITXER especificat.\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3928,12 +3942,12 @@ msgstr ""
 "                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
 
 # Es refereix al llenguatge de programació.  ivb
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3952,12 +3966,12 @@ msgstr ""
 "                       Tcl, Perl, PHP, GCC-source, NXStringTable, RST, "
 "Glade).\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++            Equival a «--language=C++».\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3967,7 +3981,7 @@ msgstr ""
 "fitxer\n"
 "d’entrada.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3976,20 +3990,20 @@ msgstr ""
 "      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
 "                       Python, Tcl i Glade).\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Per defecte s’assumeix que els fitxers d’entrada estan codificats en ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing    Uneix els missatges extrets amb els d’un fitxer\n"
 "                       existent.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
@@ -3997,11 +4011,14 @@ msgstr ""
 "                       No extreu les entrades que ja es troben al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ETIQUETA]\n"
 "                       Inclou els blocs de comentaris marcats amb "
@@ -4009,18 +4026,18 @@ msgstr ""
 "                       o aquells que precedeixen les línies amb una paraula\n"
 "                       clau, al fitxer d’eixida.\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcions específiques del llenguatge:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all    Extreu totes les cadenes.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4034,11 +4051,11 @@ msgstr ""
 "awk,\n"
 "                       Tcl, Perl, PHP, GCC-source i Glade.)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=PARAULA]\n"
 "                       Paraula clau addicional a cercar (si no s’especifica "
@@ -4046,7 +4063,7 @@ msgstr ""
 "                       PARAULA no s’empraran les paraules clau per "
 "defecte).\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4059,7 +4076,7 @@ msgstr ""
 "                       l’argument ARG de la paraula clau PARAULA.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4073,42 +4090,42 @@ msgstr ""
 "awk,\n"
 "                       YCP, Tcl, Perl, PHP i GCC-source.)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs      Interpreta els trígrafs del C ANSI a l’entrada.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt             Reconeix les cadenes de format de Qt.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                       (Només per al llenguatge C++.)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
 
 # Simplement mireu l’info.  ivb
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4117,14 +4134,14 @@ msgstr ""
 "de\n"
 "                       cadenes de format.\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4132,7 +4149,7 @@ msgstr ""
 "                       Estableix a l’eixida la propietària o propietari del\n"
 "                       copyright.\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4141,21 +4158,21 @@ msgstr ""
 "a\n"
 "                       uns usuaris diferents.\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=NOM\n"
 "                       Estableix a l’eixida el NOM del paquet.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSIÓ\n"
 "                       Estableix a l’eixida la VERSIÓ del paquet.\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4165,40 +4182,57 @@ msgstr ""
 "cadenes\n"
 "                       «msgid».\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=CADENA]\n"
 "                       Empra la CADENA, o «», com a prefix de les entrades\n"
 "                       «msgstr».\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=CADENA]\n"
 "                       Empra la CADENA, o «», com a sufix de les entrades\n"
 "                       «msgstr».\n"
 
 # Missatge d’error.  ivb
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Un argument de «--flag» no té la sintaxi «PARCLAU:NUMARG:[pass-]INDIC»: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada estàndard"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avís: "
@@ -4208,7 +4242,7 @@ msgstr "%s%s: avís: "
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4222,17 +4256,17 @@ msgstr ""
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Tot i ser declarada com a tal, %s no és una cadena vàlida de format de %s.  "
 "Motiu: %s\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4246,7 +4280,7 @@ msgstr ""
 "arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4256,28 +4290,29 @@ msgstr ""
 "«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
 "cadena buida.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "l’especificació d’argument per a la paraula clau «%.*s» és ambígua"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "avís: manca el context de la paraula clau «%.*s»"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
+msgstr ""
+"avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "els contexts de les formes singular i plural no corcorden"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4290,7 +4325,7 @@ msgstr ""
 "d’ordres.\n"
 
 # Llenguatge de programació.  ivb
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "el llenguatge «%s» no és conegut"
@@ -4298,3 +4333,27 @@ msgstr "el llenguatge «%s» no és conegut"
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<sense nom>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: no es permet l’opció «%c»\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle() ha fallat amb el codi d’error 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Encara no s’ha implementat."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "no s’ha pogut establir una E/S no blocadora amb el subprocés «%s»"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "la comunicació amb el subprocés «%s» ha fallat"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "no s’ha pogut llegir del subprocés «%s»"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "el camp «%s» encara té el valor inicial per defecte\n"

diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 4485e2b8c207d3d9599cd9a8d256f1d3dada8571..6b415b392989e9575f56e6ddb7058595ca4f390f 100644 (file)
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -13,15 +13,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\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"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -39,25 +40,25 @@ msgid "Valid arguments are:"
 msgstr ""
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1115
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
@@ -68,48 +69,48 @@ msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
 # src/msgfmt.c:321
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
 # src/message.c:1182
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -120,85 +121,84 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
 # lib/error.c:91
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznámá systémová chyba"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:657
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
 # lib/getopt.c:707
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznámý pøepínaè `%c%s'\n"
 
-# lib/getopt.c:733
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
-
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
 # lib/getopt.c:766 lib/getopt.c:896
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
 
 # lib/getopt.c:813
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
 
 # lib/getopt.c:831
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè ` -W %s' musí být zadán bez argumentu\n"
 
+# lib/getopt.c:674 lib/getopt.c:847
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -210,21 +210,21 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -234,22 +234,22 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 # lib/xmalloc.c:82
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamì» vyèerpána"
 
 # src/message.c:1115
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -268,73 +268,73 @@ msgstr "v
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+# src/message.c:1115
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "výstupní soubor \"%s\" nelze vytvoøit"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 # src/msgfmt.c:909
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 #: src/format-boost.c:449
@@ -360,9 +360,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -402,48 +402,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -536,21 +536,20 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -564,11 +563,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -617,13 +616,13 @@ msgstr ""
 # src/msgfmt.c:892
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:909
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 #: src/format-perl.c:433
@@ -634,58 +633,55 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 # src/msgfmt.c:892
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:892
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
 
 # src/msgfmt.c:909
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -722,11 +718,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -737,41 +733,41 @@ msgstr ""
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
 # src/gettextp.c:164
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "pøíli¹ mnoho argumentù"
 
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -804,29 +800,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -837,11 +833,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
@@ -855,297 +851,315 @@ msgid "could not get host name"
 msgstr ""
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 # src/msgunfmt.c:215
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1168,31 +1182,31 @@ msgstr ""
 "  -V, --version            vypí¹e oznaèení verze a ukonèí se\n"
 "  -w, --width=ÈÍSLO        nastaví ¹íøku výstupní stránky\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1221,108 +1235,100 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
 # src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "vstupní soubory nejsou zadány"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 # src/msgcmp.c:186
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1347,75 +1353,80 @@ msgstr ""
 "va¹em programu. Pokud pøi porovnávání nejsou zprávy pøesnì shodné, zkoumá se,\n"
 "zda si nejsou podobné.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
 # src/msgcmp.c:281
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
 # src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "tato zpráva je pou¾ita, ale nikoli definována..."
 
 # src/msgcmp.c:261 src/msgmerge.c:713
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale tato definice je podobná"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:281
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1423,12 +1434,12 @@ msgstr[0] "nalezena %d z
 msgstr[1] "nalezeny %d záva¾né chyby"
 msgstr[2] "nalezeno %d záva¾ných chyb"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1456,76 +1467,76 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "vstupní soubor není zadán"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "jsou po¾adovány pøesnì 2 vstupní soubory"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1534,23 +1545,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 # src/gettextp.c:154
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "chybí argumenty"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1560,68 +1571,68 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
 # src/gettextp.c:154
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "chybí argumenty"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1629,92 +1640,74 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
 # src/msgfmt.c:343
-#: src/msgfmt.c:599
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1723,7 +1716,7 @@ msgstr[1] "%d p
 msgstr[2] "%d pøelo¾ených zpráv"
 
 # src/msgfmt.c:345
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1732,7 +1725,7 @@ msgstr[1] ", %d ne
 msgstr[2] ", %d neúplných pøekladù"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1740,105 +1733,105 @@ msgstr[0] ", %d nep
 msgstr[1] ", %d nepøelo¾ené zprávy"
 msgstr[2] ", %d nepøelo¾ených zpráv"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1848,48 +1841,48 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1897,33 +1890,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1931,67 +1924,67 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "V hlavièce chybí definice znakové sady.\n"
 "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: upozornìní: chybí hlavièka PO souboru (neúplná nebo neplatná)\n"
 "%*s  upozornìní: pøevod znakové sady nebude fungovat"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 # src/msgfmt.c:471
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
 
 # src/msgfmt.c:476
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1999,56 +1992,56 @@ msgstr ""
 "pøedpona"
 
 # src/msgfmt.c:489
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "pøíkaz `domain %s' ignorován"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "prázdná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "neúplná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2088,30 +2081,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2119,24 +2112,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2144,54 +2137,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2203,54 +2196,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: upozornìní: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2259,7 +2252,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2268,7 +2261,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2277,12 +2270,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2290,7 +2283,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2299,7 +2292,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2307,66 +2300,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 # src/po-lex.c:332
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:332
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:332
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "neplatná øídící sekvence"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2375,7 +2368,7 @@ msgstr[1] "tato zpr
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2383,100 +2376,100 @@ msgstr[0] "tato zpr
 msgstr[1] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 msgstr[2] "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 # src/msgfmt.c:561
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
 
 # src/msgfmt.c:564
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "polo¾ka hlavièky `%s' by mìla zaèínat na zaèátku øádku"
 
 # src/msgfmt.c:573
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
 
-# src/msgfmt.c:583
-#: src/msgl-check.c:730
+# src/msgfmt.c:573
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2485,15 +2478,15 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2502,17 +2495,17 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
 "Tato verze byla kompilována bez iconv().\n"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
 # src/msgmerge.c:321
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2537,51 +2530,51 @@ msgstr ""
 "základì podobnosti vzorù. Tím je dosa¾eno lep¹ího slití obou katalogù.\n"
 "  Není-li výstupní soubor urèen, výsledek bude vypisován na standardní výstup.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2593,7 +2586,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2601,36 +2594,31 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "tato zpráva je pou¾ita, ale nikoli definována v %s"
 
 # src/msgmerge.c:769
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2640,62 +2628,64 @@ msgstr ""
 "chybí %ld, zastaralých %ld.\n"
 
 # src/msgmerge.c:775
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " dokonèeno.\n"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2704,41 +2694,41 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2751,19 +2741,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<standardní vstup>"
@@ -2853,72 +2843,72 @@ msgid "plural form has wrong index"
 msgstr "mno¾né èíslo má chybný index"
 
 # src/po-lex.c:129 src/po-lex.c:168
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "pøíli¹ mnoho chyb, konèím"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "neplatná víceznaková sekvence"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
 # src/po-lex.c:241
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "klíèové slovo \"%s\" není známo"
 
 # src/po-lex.c:332
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "neplatná øídící sekvence"
 
 # src/po-lex.c:420
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "konec souboru uprostøed øetìzce"
 
 # src/po-lex.c:415
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "konec øádku uprostøed øetìzce"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
 
 # src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "dvojnásobná definice zprávy"
 
 # src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...toto je umístìní první definice"
@@ -3023,17 +3013,17 @@ msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
 # src/gettextp.c:164
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "pøíli¹ mnoho argumentù"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3041,11 +3031,26 @@ msgid ""
 msgstr ""
 
 # src/message.c:1182
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3078,42 +3083,42 @@ msgid ""
 msgstr ""
 
 # src/message.c:1115
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 # src/message.c:1122
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standardní výstup"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3125,13 +3130,13 @@ msgid "error while opening \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
 # src/message.c:784
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "zprávy katalogu nesmí obsahovat escape sekvenci `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3140,7 +3145,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3157,8 +3162,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3176,13 +3181,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "chyba pøi zápisu do souboru \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3201,70 +3206,67 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:892
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3272,33 +3274,33 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:892
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 
 # src/xget-lex.c:914
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3308,56 +3310,54 @@ msgstr ""
 "Tato verze byla kompilována bez iconv().\n"
 
 # src/xget-lex.c:914
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
 # lib/getopt.c:736
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3365,7 +3365,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3373,7 +3373,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3381,7 +3381,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3389,7 +3389,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3397,28 +3397,28 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3426,52 +3426,52 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:386
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
 
 # src/xgettext.c:501
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3483,58 +3483,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3543,14 +3546,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3558,7 +3561,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3567,120 +3570,137 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
 # src/xget-lex.c:150
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardní vstup"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: upozornìní: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3689,34 +3709,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3725,7 +3745,7 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' není znám"
@@ -3734,6 +3754,15 @@ msgstr "jazyk `%s' nen
 msgid "<unnamed>"
 msgstr ""
 
+# lib/getopt.c:733
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neznámý pøepínaè -- %c\n"
+
+# src/msgfmt.c:583
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "polo¾ka `%s' má stále poèáteèní implicitní hodnotu"
+
 # src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
 # src/msgunfmt.c:175 src/xgettext.c:394
 #~ msgid ""

diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index ab35c5144712d070f3d559040f5f3f6a0c9b7bb1..205771fc25815ed8f86dcfb25c6722f203153dd6 100644 (file)
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.12-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2003-03-08 19:32+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,22 +34,22 @@ msgstr "flertydigt argument '%s' for '%s'"
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke finde et midlertidigt katalog, prøv at sætte $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
@@ -57,44 +58,44 @@ msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "Kan ikke åbne sikkerhedskopi-fil '%s' for skrivning"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fejl efter læsning af '%s'"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() mislykkedes"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
@@ -105,74 +106,73 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 "Virtuel Javamaskine ikke fundet, forsøg at installere gij eller sæt $JAVA"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-underproces mislykkedes"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tilvalget `%s' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovligt tilvalg -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget '%c' kræver et argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tilvalget `%s' kræver et argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -184,20 +184,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator ikke fundet, forsøg at installere gcj eller sæt $JAVAC"
@@ -208,20 +208,20 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuel Javamaskine ikke fundet, forsøg at installere gij eller sæt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -240,72 +240,71 @@ msgstr "kan ikke oprette datakanal '%s'"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, fuzzy, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "%s-underproces fejlede med slutstatus %d"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikke oprette uddatafil '%s'"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s underproces"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s underproces fik et dødeligt signal %d"
 
-#: src/format.c:143
+#: src/format.c:148
 #, fuzzy, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv for argument \"%u\", som i \"%s\", findes ikke i \"msgid"
 "\""
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument %u findes ikke i \"%s\""
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formatangivelser i 'msgid' og '%s' for argument %u er ikke ens"
 
 #: src/format-boost.c:449
@@ -330,9 +329,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antal af formatangivelser i 'msgid' og '%s' er ikke overensstemmende"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -372,48 +371,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -503,22 +502,21 @@ msgid ""
 msgstr ""
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv for argument {%u}, som i \"%s\", findes ikke i \"msgid\""
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument {%u} findes ikke i \"%s\""
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formatangivelser i 'msgid' og '%s' for argument {%u} er ikke det samme"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -532,11 +530,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -583,13 +581,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "formatangivelser i 'msgid' og '%s' er ikke de samme"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateringsdirektiv i \"%s\" er ikke en delmængde af dem i \"msgid\""
 
 #: src/format-perl.c:433
@@ -599,61 +597,58 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument \"%s\" findes ikke i \"%s\""
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "formateringsdirektiv i \"msgid\" tager en afbildning, dem i \"%s\" tager en "
 "tuppel"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "formateringsdirektiv i \"msgid\" tager en tuppel, de i \"%s\" tager en "
 "afbildning"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv for argument \"%s\", som i \"%s\", findes ikke i \"msgid"
 "\""
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "formateringsdirektiv i \"msgid\" og \"%s\" for argument \"%s\" er ikke ens"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -690,11 +685,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -703,38 +698,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Brug: %s [TILVALG]\n"
@@ -772,29 +767,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -806,11 +801,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportér fejl på engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -819,30 +814,30 @@ msgstr "Rapport
 msgid "could not get host name"
 msgstr "kunne ikke hente værtsnavn"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Højst én inddatalinje tilladt"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -851,10 +846,10 @@ msgstr ""
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -863,30 +858,30 @@ msgstr ""
 "tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
@@ -894,24 +889,24 @@ msgstr ""
 "  FIL ...                  .mo-infiler\n"
 "Hvis ingen indfil er givet eller hvis den er - læses standard-ind.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, fuzzy, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -922,203 +917,221 @@ msgstr ""
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1131,31 +1144,31 @@ msgstr ""
 "      --no-wrap               ombryd ikke lange beskeder, længere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1177,105 +1190,97 @@ msgstr ""
 "men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n"
 "der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ingen filer angivet som inddata"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "der kræves netop to inddatafiler"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1294,22 +1299,22 @@ msgstr ""
 "mellem msgid-tekststrengene, benyttes en upræcis sammenligningsmetode til at\n"
 "give bedre fejlretningsinformation.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, fuzzy, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1318,7 +1323,12 @@ msgstr ""
 "Bearbejdningsvarianter:\n"
 "  -m, --multi-domain          brug ref.pot til hvert domæne i def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
@@ -1328,54 +1338,54 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne tekst bruges, men er ikke erklæret..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denne tekst ligner"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne tekst er brugt, men ikke erklæret i %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fandt %d fatal fejl"
 msgstr[1] "fandt %d fatale fejl"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Mindst to filer skal angives"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1395,30 +1405,30 @@ msgstr ""
 "men kun fra den første PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n"
 "vil blive sammenbragt.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, fuzzy, c-format
 msgid "Conversion target:\n"
 msgstr "konverteringsfejl"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, fuzzy, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
@@ -1426,46 +1436,46 @@ msgstr ""
 "  -t, --to-code=NAVN          Kodning for uddata\n"
 "Standardværdi er nuværende locales kodning.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "der kræves præcist én inddatafil"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Brug: %s [FLAG] INDFIL\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1478,22 +1488,22 @@ msgstr ""
 "Uoversatte poster gives en oversættelse som er identisk med msgid og\n"
 "markeres som uafklaret.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "kommandonavn mangler"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Brug: %s [TILVALG] KOMMANDO [KOMMANDOTILVALG]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1508,7 +1518,7 @@ msgstr ""
 "bliver uddata fra msgexec.  Slutstatusværdien for msgexec er den største\n"
 "slutstatusværdi fra alle kommandokørslerne.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1518,42 +1528,42 @@ msgstr ""
 "af et nultegn. Uddata for \"msgexec 0\" er brugbart som inddata for\n"
 "\"xargs -O\"\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning til standard ud mislykkedes"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "filternavn mangler"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "mindst et sed-skript skal angives"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Udfører et filter på alle oversættelser i et beskedskatalog.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1562,18 +1572,18 @@ msgstr ""
 "FILTER kan være hvilket som helst program som læser en oversættelse fra\n"
 "standard ind og skriver den ændrede oversættelse til standard ud.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1581,123 +1591,105 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "kan ikke opsætte ikke-blokerende I/O til %s-underproces"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "kommunikation med %s-underproces mislykkedes"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "læsning fra %s-underproces mislykkedes"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s-underproces afsluttede med slutstatus %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet til %s bør være et enkelt skilletegn"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kræver at \"-d katalog\" angives"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kræver en \"-l lokale\"-angivelse"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d uafklaret oversættelse"
 msgstr[1] ", %d uafklarede oversættelser"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generér binært tekstkatalog fra oversættelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1707,17 +1699,17 @@ msgstr ""
 "korte tilvalg.\n"
 "Tilvarende gælder for valgfri argumenter.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1727,14 +1719,14 @@ msgstr ""
 "  -j, --java               Javatilstand: generér en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
@@ -1744,7 +1736,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1756,13 +1748,13 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, fuzzy, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
@@ -1772,41 +1764,41 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1822,48 +1814,48 @@ msgstr ""
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1871,33 +1863,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1905,12 +1897,12 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1919,7 +1911,7 @@ msgstr ""
 "  -a, --alignment=TAL         læg strenge på lige TAL byte (normalt: %d)\n"
 "      --no-hash               binærfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -1928,79 +1920,79 @@ msgstr ""
 "  -a, --alignment=TAL         læg strenge på lige TAL byte (normalt: %d)\n"
 "      --no-hash               binærfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegnsætskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domænet '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "tom `msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "\"fuzzy\" `msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2008,7 +2000,7 @@ msgid ""
 msgstr ""
 "flaget \"%c\" kan ikke bruges førend \"K\" eller \"T\" er blevet angivet"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2017,7 +2009,7 @@ msgstr ""
 "Udtrækker alle beskeder i et beskedskatalog som matcher et vist\n"
 "mønster eller hører til en given kildetekstfil.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2084,23 +2076,23 @@ msgstr ""
 "  -f, --file=FIL              hent MØNSTER fra FIL\n"
 "  -i, --ignore-case           versalufølsomt\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2110,7 +2102,7 @@ msgstr ""
 "LANG som beskrevet i filen ABOUT-NLS. Dette er nødvendigt for at\n"
 "du kan teste dine oversættelser.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2121,12 +2113,12 @@ msgstr ""
 "Angiv locale med flaget --locale eller\n"
 ".po-udfilen med flaget --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Oprettede %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2135,12 +2127,12 @@ msgstr ""
 "Opretter en ny PO-fil og initierer metainformation med værdier fra\n"
 "brugerens miljøvariabler.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, fuzzy, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2152,12 +2144,12 @@ msgstr ""
 "Hvis ingen indfil angives, søges efter POT-filen i aktuelt katalog.\n"
 "Hvis den er - læses standard ind.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, fuzzy, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2169,18 +2161,18 @@ msgstr ""
 "brugerens\n"
 "indstilling af locale. Hvis den er - skrives resultaterne på standard ud.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2188,12 +2180,12 @@ msgstr ""
 "Fandt mere end en .pot-fil.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fejl ved læsning af aktuelt katalog"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2201,14 +2193,14 @@ msgstr ""
 "Fandt ingen .pot-fil i aktuelt katalog.\n"
 "Angiv .pot-indfil med flaget --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-underproces fejlede med slutstatus %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2223,28 +2215,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Danske oversættelser for pakke %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuværende tegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "to forskellige tegnsæt \"%s\" og \"%s\" i indfilen"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "indfilen \"%s\" mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2253,19 +2245,19 @@ msgstr ""
 "domæne \"%s\" i indfil \"%s\" mangler en indgang i hovedet med angivelse af "
 "tegnsæt"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "måltegnsæt \"%s\" er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2274,7 +2266,7 @@ msgstr ""
 "Indfiler har beskeder med flere kodninger, deriblandt UTF-8.\n"
 "Konverterer resultatet til UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2286,7 +2278,7 @@ msgstr ""
 "Konverterer resultatet til UTF-8.\n"
 "Brug flaget --to-code for at vælge en anden kodning.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2295,7 +2287,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2308,12 +2300,12 @@ msgstr ""
 "Resultatet for \"%s\" kan blive forkert.\n"
 "Mulige måder at omgå problemet er:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Sæt LC_ALL til et locale med kodning %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2324,7 +2316,7 @@ msgstr ""
 "  udfør derefter \"%s\",\n"
 "  konvertér så tilbage til %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2337,7 +2329,7 @@ msgstr ""
 "  udfør derefter \"%s\"\n"
 "  konvertér så tilbage til %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2348,77 +2340,77 @@ msgstr ""
 "Resultatet for \"%s\" kan blive forkert.\n"
 "En mulig måde at omgå problemet er at sætte LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "flertalsudtryk kan give negative værdier"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "flertalsudtryk kan give division med nul"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "flertalsudtryk kan give heltalsoverløb"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Prøv at bruge det følgende, gældende for %s:\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "tekstkatalog har oversættelser med flertalsform..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=UDTRYK\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...men headerindgange mangler attribut af type \"plurals=HELTAL\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-værdi"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...men nogen tekster har kun én flertalsform"
 msgstr[1] "...men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...men nogen tekster har én flertalsform"
 msgstr[1] "...men nogen tekster har %lu flertalsformer"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2426,81 +2418,81 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer, men mangler en "
 "headerindgang med \"Plural-Forms: nplurals=HELTAL; plural=UDTRYK;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgid_plural'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' og `msgstr' teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler mærket \"%c\" for tastaturgenvej"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange mærker \"%c\" for tastaturgenveje"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "feltet `%s' mangler i hovedet\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "feltet '%s' i hovedet bør starte ved linjens begyndelse\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "feltet `%s' har stadig den oprindelige standardværdi\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nogle felter i hovedet har stadig den oprindelige standardværdi\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2509,15 +2501,15 @@ msgstr ""
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() "
 "understøtter ikke denne konvertering."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2526,16 +2518,16 @@ msgstr ""
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(). Denne version "
 "er bygget uden iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s er kun gyldig med %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "sikkerhedskopitype"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2559,24 +2551,24 @@ msgstr ""
 "overensstemmelse, vil 'løs søgning' (fuzzy matching) blive brugt til at give\n"
 "bedre resultater.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, fuzzy, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2587,27 +2579,27 @@ msgstr ""
 "                              gør ingenting hvis def.po allerede er "
 "opdateret\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, fuzzy, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2633,7 +2625,7 @@ msgstr ""
 "eller\n"
 "miljøvariablen SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2641,12 +2633,7 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2657,50 +2644,52 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "denne tekst burde definere flertalsformer"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "denne tekst burde ikke definere flertalsformer"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler %"
-"ld, forældede %ld.\n"
+"%sLæste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
+"%ld, forældede %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " afsluttet.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og udtrykkelige filnavne udelukker hinanden"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Brug: %s [TILVALG] [FIL]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Konvertér et binær beskedskatalog til en .po-fil af Uniforum-type\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, fuzzy, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2710,7 +2699,7 @@ msgstr ""
 "  -j, --java               Javatilstand: generér en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
@@ -2720,7 +2709,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2732,7 +2721,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, fuzzy, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2743,17 +2732,17 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2766,41 +2755,41 @@ msgstr ""
 "Klassenavnet bestemmes ved at tilføje localenavnet til ressourcenavnet\n"
 "adskilt med en understreg. Klassen findes med hjælp af CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2822,12 +2811,12 @@ msgstr ""
 "oversættelse. Filpositioner samles sammen.\n"
 "Når flaget --unique angives fjernes alle gentagede.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, fuzzy, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2838,7 +2827,7 @@ msgstr ""
 "  -u, --unique                   skriv kun unikke beskeder, gentagede "
 "fjernes\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdind>"
@@ -2924,65 +2913,65 @@ msgstr "f
 msgid "plural form has wrong index"
 msgstr "flertalsform har forkert indeks"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "afbryder kørslen på grund af for mange fejl"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Ugyldig multibytesekvens ved slutning på fil"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "Ugyldig multibytesekvens ved slutning på linje"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv-fejl"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ukendt nøgleord '%s'"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "ugyldig kontrolsekvens"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "tekststreng ikke afsluttet da filens slutning blev nået"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "tekststreng var ikke afsluttet ved linjeskift"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil må ikke indeholde 'domain'-kommandoer"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "tekst erklæret mere end en gang"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "... her er den første erklæring"
@@ -3072,17 +3061,17 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved læse-åbning af '%s'"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "forventede to argumenter"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Brug: %s [TILVALG] URL FIL\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3091,11 +3080,26 @@ msgstr ""
 "Henter og udskriver indholdet af en URL. Hvis URL'en ikke kan hentes bruges\n"
 "den lokale fil FIL i stedet.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fejl ved skrivning af standard-uddata"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3133,47 +3137,47 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standard-uddata"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3185,13 +3189,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opstået ved skrive-åbning af '%s'"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "oversættelige tekster må ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3204,7 +3208,7 @@ msgstr ""
 "som er et andet end dit. Forsøg at bruge en ren ASCII-msgid i stedet.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3228,8 +3232,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3246,7 +3250,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3255,7 +3259,7 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3281,36 +3285,34 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regulært udtryk ikke afsluttet"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, fuzzy, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3319,7 +3321,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3328,7 +3330,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3337,7 +3339,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3346,12 +3348,12 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "iconv-fejl"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3360,32 +3362,32 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt ISO 10646-tegn"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3394,57 +3396,56 @@ msgstr ""
 "Sproget 'glade' er ikke understøttet. %s bygger på expat,\n"
 "Denne version er bygget uden expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3454,7 +3455,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3464,7 +3465,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3474,7 +3475,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3484,7 +3485,7 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3494,79 +3495,79 @@ msgstr ""
 "Ikke-ASCII streng ved %s%s.\n"
 "Angiv venligst kodning af kildetekst via --from-code."
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: mangler tal efter #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ugyldigt streng-udtryk"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke benyttes når uddata sendes til standard-uddata"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtræk oversættelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen inddatafil angivet"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3585,19 +3586,19 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, fuzzy, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3608,43 +3609,46 @@ msgstr ""
 "                                   (undtagen for Python, Tcl, Glade)\n"
 "Som standard antages inddatafilerne at være i ASCII.\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -j, --join-existing            kombiner tekster med eksisterende fil\n"
 "  -x, --exclude-file=FIL.po      tekster i FIL.po benyttes ikke\n"
 "  -c, --add-comments[=MÆRKE]     placér kommentarafsnit for MÆRKE (eller \n"
 "                                 de foregående nøgleordslinjer) i uddata\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3660,14 +3664,14 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3675,7 +3679,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3691,17 +3695,17 @@ msgstr ""
 "  -C, --c++                      kort skrivemåde for --language=C++\n"
 "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
@@ -3711,12 +3715,12 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
@@ -3726,7 +3730,7 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -3736,89 +3740,106 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, fuzzy, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr "'%s' er ikke en gyldig formatstreng i %s, til forskel fra \"msgid\""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3827,7 +3848,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3837,27 +3858,27 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "flertydigt argument '%s' for '%s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3869,7 +3890,7 @@ msgstr ""
 "variablen MSGID_BUGS_ADDRESS dér; ellers angiv\n"
 "tilvalget --msgid-bugs-address på kommandolinjen.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ukendt sprog '%s'"
@@ -3878,6 +3899,28 @@ msgstr "ukendt sprog '%s'"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovligt tilvalg -- %c\n"
+
+#, fuzzy
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "%s-underproces fejlede med slutstatus %d"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "kan ikke opsætte ikke-blokerende I/O til %s-underproces"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "kommunikation med %s-underproces mislykkedes"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "læsning fra %s-underproces mislykkedes"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s-underproces afsluttede med slutstatus %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet `%s' har stadig den oprindelige standardværdi\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 2fa412976f19c60f019c3f13c3b56094aacad224..0ec7cdac47c5d868edbda5a699fee6ad350d8604 100644 (file)
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -82,7 +82,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-07-19 22:52+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-07-24 09:27+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -107,24 +107,24 @@ msgstr "mehrdeutiges Argument %s für %s"
 msgid "Valid arguments are:"
 msgstr "Gültige Argumente sind:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "temporäres Verzeichnis ist nicht zu finden; bitte setzen Sie $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "es ist nicht möglich, ein temporäres Verzeichnis mittels\n"
 "der Vorlage »%s« anzulegen"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Temporäre Datei %s kann nicht entfernt werden"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Temporäres Verz/Verzeichnis %s kann nicht entfernt werden"
@@ -133,37 +133,37 @@ msgstr "Temporäres Verz/Verzeichnis %s kann nicht entfernt werden"
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1831 src/xgettext.c:1844
-#: src/xgettext.c:1854
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "Öffnen der Sicherungsdatei »%s« zum Schreiben fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:228
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "Fehler beim Schreiben von »%s«"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:238
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "Fehler nach dem Lesen von »%s«"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:845
-#: src/msginit.c:920 src/msginit.c:1080 src/msginit.c:1179
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -180,74 +180,73 @@ msgstr "C#-Compiler nicht gefunden; bitte »pnet« installieren"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
 
-#: gnulib-lib/error.c:127
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:235
-#: gnulib-lib/pipe.c:348 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprozeß %s fehlgeschlagen"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: Option »--%s« erwartet kein 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"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Option »%c%s« erwartet kein 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"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzulässige Option -- %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ungültige Option -- %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"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Option »%s« erwartet ein Argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -259,14 +258,14 @@ msgstr "ungültiges Argument source_version für compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ungültiges Argument target_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen von »%s«"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -285,8 +284,8 @@ msgstr ""
 "Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
 "$JAVA setzen"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:853 src/msginit.c:928
-#: src/msginit.c:1088
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Subprozeß %s mit Ein-/Ausgabefehler"
@@ -298,8 +297,8 @@ msgstr "Subprozeß %s mit Ein-/Ausgabefehler"
 msgid "memory exhausted"
 msgstr "virtueller Speicher aufgebraucht"
 
-#: gnulib-lib/pipe.c:139 gnulib-lib/pipe.c:144 gnulib-lib/pipe.c:264
-#: gnulib-lib/pipe.c:267
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
@@ -317,31 +316,26 @@ msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:249
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:250
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/w32spawn.h:55
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle ist mit dem Exitcode 0x%08x fehlgeschlagen"
-
-#: gnulib-lib/w32spawn.h:60
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fehlgeschlagen"
 
-#: gnulib-lib/w32spawn.h:101
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
@@ -366,7 +360,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -376,7 +370,7 @@ msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -384,7 +378,7 @@ msgstr "eine Formatspezifikation für Argument »%u« fehlt in »%s«"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -844,11 +838,11 @@ msgstr ""
 "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
 "zwischen 1 und 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:179
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -863,38 +857,38 @@ msgstr ""
 "weiterzugeben.\n"
 "Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:185
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:185 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:249
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Aufruf: %s [OPTION]\n"
@@ -929,29 +923,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:291
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:293
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:295
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
@@ -960,11 +954,11 @@ msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:302
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -977,30 +971,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "höchstens eine Eingabedatei erlaubt"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1009,10 +1003,10 @@ msgstr ""
 "Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n"
 "Attribute der Meldungen bearbeiten.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:272 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1020,56 +1014,56 @@ msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:275 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:279 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=VERZ        VERZ der Liste der Eingabedateien hinzufügen\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:281 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1079,73 +1073,73 @@ msgstr ""
 "oder\n"
 "»-« angegeben ist.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Auswahl der Meldungen:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            übersetzte übernehmen, unübersetzte verwerfen\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          unübersetzte übernehmen, übersetzte verwerfen\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              mit 'fuzzy' markierte verwerfen\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            mit 'fuzzy' markierte übernehmen\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           obsolete Meldungen (#~) verwerfen\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         obsolete Meldungen (#~) übernehmen\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute verändern:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy              alle Meldungen auf 'fuzzy' setzen\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy            'fuzzy'-Markierung von allen Meldungen "
 "entfernen\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete           alle Meldungen obsolet machen\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete         alle Meldungen nicht-obsolet machen\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1154,7 +1148,7 @@ msgstr ""
 "      --clear-previous            »previous msgid« von allen Meldungen "
 "entfernen\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1163,7 +1157,7 @@ msgstr ""
 "po\n"
 "                                 gelistet sind\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1172,13 +1166,13 @@ msgstr ""
 "po\n"
 "                                 nicht gelistet sind\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                  Synonym für »--only-fuzzy --clear-fuzzy«\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1186,16 +1180,16 @@ msgstr ""
 "      --obsolete               Synonym für »--only-obsolete --clear-"
 "obsolete«\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:284 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax der Eingabedatei:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:286
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1203,8 +1197,8 @@ msgstr ""
 "  -P, --properties-input      Eingabedatei folgt der .properties-Syntax von\n"
 "                                Java\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:288
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1213,17 +1207,42 @@ msgstr ""
 "      --stringtable-input     Eingabedatei folgt der .strings-Syntax von\n"
 "                                Nextstep/Gnustep\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 immer Farben und andere Text-Attribute "
+"verwenden\n"
+"      --color=BEI             Farben und andere Text-Attribute verwenden, "
+"wenn BEI.\n"
+"                              Bei kann 'always', 'never', 'auto' oder 'html' "
+"sein.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=STYLEDATEI      CSS-Datei mit Style-Regel für --color angeben\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1231,9 +1250,9 @@ msgstr ""
 "  -e, --no-escape           keine C-Escape-Sequenzen in Ausgabe verwenden\n"
 "                              (Vorgabe)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1241,29 +1260,29 @@ msgstr ""
 "  -E, --escape              C-Escape-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po            PO-Datei erstellen, auch wenn sie leer ist\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent              Ausgabe eingerückt darstellen\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location         Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1271,26 +1290,26 @@ msgstr ""
 "  -n, --add-location        Zeilen mit »#: Datei:Zeilennr.« erhalten "
 "(Vorgabe)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict              .po-Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output   Datei in der .properties-Syntax von Java\n"
 "                              ausgeben\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1298,17 +1317,17 @@ msgstr ""
 "      --stringtable-output   eine ».strings«-Datei von Nextstep/Gnustep\n"
 "                               erstellen\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ANZAHL        Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1318,27 +1337,27 @@ msgstr ""
 "                              Breite der Ausgabe sind, nicht auf mehrere\n"
 "                              Zeilen umbrechen\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output         sortierte Ausgabe erstellen\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
@@ -1368,24 +1387,24 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1403,7 +1422,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: 0)\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1412,8 +1431,8 @@ msgstr ""
 "  -u, --unique               Abkürzung für »--less-than=2«; Meldungen\n"
 "                             anfordern, die nur einmal vorkommen\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1422,8 +1441,8 @@ msgstr ""
 "von\n"
 "                              Java\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1433,12 +1452,12 @@ msgstr ""
 "Syntax\n"
 "                              für .strings\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          Kodierung für die Ausgabe\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1448,49 +1467,28 @@ msgstr ""
 "                                Meldung verwenden, nicht mehrere\n"
 "                                Übersetzungen zusammenziehen\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 immer Farben und andere Text-Attribute "
-"verwenden\n"
-"      --color=BEI             Farben und andere Text-Attribute verwenden, "
-"wenn BEI.\n"
-"                              Bei kann 'always', 'never', 'auto' oder 'html' "
-"sein.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=STYLEDATEI      CSS-Datei mit Style-Regel für --color angeben\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "keine Eingabedateien angegeben"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "es werden genau zwei Eingabedateien benötigt"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n"
@@ -1525,12 +1523,12 @@ msgstr "  Def.po                        Übersetzungen\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  Ref.pot                       Referenzen auf die Quelldateien\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1538,7 +1536,7 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          Ref.pot auf jeden Bereich in Def.po anwenden\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     fuzzy-Übereinstimmung nicht verwenden\n"
@@ -1563,17 +1561,17 @@ msgstr "diese Meldung ist unübersetzt"
 msgid "this message needs to be reviewed by the translator"
 msgstr "diese Meldung muss vom Übersetzer geprüft werden"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...diese Definition ist ähnlich"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
@@ -1590,12 +1588,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "es ist %d fataler Fehler aufgetreten"
 msgstr[1] "es sind %d fatale Fehler aufgetreten"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "es müssen mindestens zwei Dateien angegeben werden"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1617,7 +1615,7 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1626,7 +1624,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1634,39 +1632,39 @@ msgstr ""
 "      --omit-header             »msgid \"\"«-Eintrag im Kopfteil nicht "
 "erstellen\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Einen Katalog mit Übersetzungen in eine andere Zeichensatz-Kodierung\n"
 "konvertieren.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Zielformat der Konvertierung:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                  Ausgabe eingerückt darstellen\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location             Zeilen mit »#: Datei:Zeilennr.« nicht "
 "schreiben\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1674,30 +1672,30 @@ msgstr ""
 "      --add-location            Zeilen mit »#: Datei:Zeilennr.« erhalten\n"
 "                                  (Vorgabe)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                  .po-Datei streng nach Uniforum-Format "
 "erstellen\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "es wird genau eine Eingabedatei benötigt"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Aufruf: %s [OPTION] EINGABEDATEI\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1710,22 +1708,22 @@ msgstr ""
 "i. A. von xgettext erstellt).  Unübersetzte Einträge bekommen eine Übersetzung\n"
 "zugewiesen, die mit der msgid identisch ist.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  EINGABEDATEI                PO- oder POT-Eingabedatei\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "Name des Befehls fehlt"
 
-#: src/msgexec.c:253
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Aufruf: %s [OPTION] BEFEHL [BEFEHL-OPTION]\n"
 
-#: src/msgexec.c:258
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1741,7 +1739,7 @@ msgstr ""
 "Ausgabe wird zur Ausgabe von »msgexec«.  Der Rückgabewert von »msgexec« ist der\n"
 "höchste Rückgabewert von allen Aufrufen.\n"
 
-#: src/msgexec.c:267
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1751,44 +1749,44 @@ msgstr ""
 "von einem Nullbyte-Zeichen.  Die Ausgabe von »msgexec 0« ist geeignet als\n"
 "Eingabe für »xargs -0«.\n"
 
-#: src/msgexec.c:277 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=EINGABEDATEI    PO-Eingabedatei\n"
 
-#: src/msgexec.c:341
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "Schreiben nach Standardausgabe fehlgeschlagen"
 
-#: src/msgexec.c:374
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Schreiben zum Subprozeß %s fehlgeschlagen"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "Name des Filters fehlt"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "es muß mindestens ein sed-Skript angegeben werden"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen "
 "anwenden.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1799,19 +1797,19 @@ msgstr ""
 "Standardausgabe\n"
 "schreibt.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Nützliche FILTER-OPTIONen, wenn »sed« der FILTER ist:\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SKRIPT     SKRIPT den auszuführenden Befehlen hinzufügen\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1821,14 +1819,14 @@ msgstr ""
 "  -f, --file=SKRIPT_DATEI     Inhalt der SKRIPT_DATEI den auszuführenden\n"
 "                                Befehlen hinzufügen\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       \"Pattern-Space\" nicht automatisch ausgeben\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1836,12 +1834,12 @@ msgstr ""
 "      --no-escape                   keine C-Escape-Sequenzen in Ausgabe\n"
 "                                      verwenden (Vorgabe)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent               Ausgabe eingerückt darstellen\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1860,22 +1858,22 @@ msgid "invalid endianness: %s"
 msgstr "ungültiger Endian-Wert: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-l Lokale«"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ist nur mit %s oder %s gültig"
@@ -1924,7 +1922,7 @@ msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1938,7 +1936,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
@@ -1995,7 +1993,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict             Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -2007,13 +2005,13 @@ msgstr ""
 msgid "Output file location in Java mode:\n"
 msgstr "Angaben zu Ausgabedateien im Java-Modus:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    Name der Ressource\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2052,7 +2050,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2078,7 +2076,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -2094,7 +2092,7 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Überprüfung der Eingebedatei:\n"
@@ -2185,7 +2183,7 @@ msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics             Statistik zu den Übersetzungen anzeigen\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -2245,7 +2243,7 @@ msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2256,7 +2254,7 @@ msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2265,7 +2263,7 @@ msgstr ""
 "Option »%c« kann nicht verwendet werden, bevor »J«, »K«, »T«, »C« oder »X« "
 "festgelegt ist"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2276,7 +2274,7 @@ msgstr ""
 
 # To avoid confusion, let msgid and msgstr untranslated here!
 # 2001-11-04 11:16:55 CET -ke-
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2359,7 +2357,7 @@ msgstr ""
 "  -v, --invert-match          Nur die Meldungen ausgeben, die nicht mit einem\n"
 "                                Auswahlkriterium übereinstimmen\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2367,18 +2365,18 @@ msgstr ""
 "      --escape              C-Escape-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output         sortierte Ausgabe erstellen\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2389,7 +2387,7 @@ msgstr ""
 "beschrieben.  Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
 "können.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2400,12 +2398,12 @@ msgstr ""
 "Bitte legen Sie die Lokale mit der Option »--locale« oder\n"
 "die .po-Datei für die Ausgabe mit der Option »--output-file« fest.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s wurde erstellt.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2414,12 +2412,12 @@ msgstr ""
 "Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n"
 "Benutzers initialisieren.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=EINGABEDATEI    POT-Eingabedatei\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2431,13 +2429,13 @@ msgstr ""
 "POT-Datei gesucht.  Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2448,19 +2446,19 @@ msgstr ""
 "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
 "ist.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          Lokale für die Ausgabe setzen\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2468,12 +2466,12 @@ msgstr ""
 "Mehr als eine .pot-Datei gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "Fehler beim Lesen des aktuellen Verzeichnisses"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2481,14 +2479,14 @@ msgstr ""
 "Keine .pot-Datei im aktuellen Verzeichnis gefunden.\n"
 "Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
 
-#: src/msginit.c:866 src/msginit.c:941 src/msginit.c:1101 src/msginit.c:1196
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "Subprozeß %s mit dem Exitcode %d fehlgeschlagen"
 
-#: src/msginit.c:1066
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2505,17 +2503,17 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1482
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "German messages for %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "der Zeichensatz »%s« bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
@@ -2536,14 +2534,14 @@ msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
 "Zeichensatzes"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2955
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
@@ -2779,25 +2777,25 @@ msgid "header field `%s' still has the initial default value\n"
 msgstr ""
 "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: Eingabe ist nicht gültig in der Kodierung »%s«"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: Fehler beim Konvertieren von der Kodierung »%s« nach der\n"
 "Kodierung »%s«"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:620 src/xgettext.c:640
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2806,7 +2804,7 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2815,8 +2813,8 @@ msgstr ""
 "Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche "
 "msgids werden gleich."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:627
-#: src/xgettext.c:647
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2825,16 +2823,16 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab.  Diese Version wurde ohne iconv() erstellt."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ist nur mit %s gültig"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "Art der Sicherung"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2858,19 +2856,19 @@ msgstr ""
 "exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
 "versucht, ein besseres Ergebnis zu erzielen.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  Def.po                   Übersetzungen, die sich auf die alten Quellen\n"
 "                             beziehen\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  Ref.pot                  Referenzen aus den neuen Quellen\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2879,7 +2877,7 @@ msgstr ""
 "  -C, --compendium=DATEI   zusätzliche Bibliothek mit Übersetzungen, es\n"
 "                             können mehrere angegeben werden\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2888,30 +2886,30 @@ msgstr ""
 "  -U, --update                Def.po aktualisieren; nichts unternehmen,\n"
 "                                wenn Def.po bereits aktuell ist\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Angaben zu Ausgabedateien beim Aktualisieren (Update):\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 "      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFFIX         Das übliche Suffix der Sicherungskopie\n"
 "                                überschreiben\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2933,7 +2931,7 @@ msgstr ""
 "                    andernfalls einfache.\n"
 "  simple, never   immer einfache Sicherungskopien erstellen\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2943,7 +2941,7 @@ msgstr ""
 "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
 "Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2952,22 +2950,22 @@ msgstr ""
 "Meldungen\n"
 "                             beibehalten\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       Fortschrittsanzeige unterdrücken\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "diese Meldung sollte Pluralformen definieren"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "diese Meldung sollte keine Pluralformen definieren"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2976,30 +2974,30 @@ msgstr ""
 "%s%ld alte + %ld Referenzeinträge gelesen,\n"
 "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " fertig.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s und explizite Angabe des Dateinamens schließen sich gegenseitig aus"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Aufruf: %s [OPTION] [DATEI]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Binären Katalog mit Meldungen in eine .po-Datei gemäß Uniforum-Format\n"
 "umwandeln.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -3009,12 +3007,12 @@ msgstr ""
 "Klasse\n"
 "                             für Java erstellen\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C#-Modus: Eingabe ist eine .dll-Datei\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -3023,7 +3021,7 @@ msgstr ""
 "      --csharp-resources      C#-Ressourcenmodus: .NET-.resources-Datei ist\n"
 "                                eine eingabedatei\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -3031,17 +3029,17 @@ msgstr ""
 "      --tcl                Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
 "Datei\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DATEI ...                     .mo-Eingabedateien\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Angaben zu Eingabedateien im Java-Modus:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -3054,12 +3052,12 @@ msgstr ""
 "Option\n"
 "»-d« ist notwendig.  Die Klasse mittels CLASSPATH gesucht.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Angaben zu Eingabedateien im C#-Modus:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3070,12 +3068,12 @@ msgstr ""
 "dessen\n"
 "Name von der Lokale abhängig ist.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Angaben zu Eingabedateien im Tcl-Modus:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3084,18 +3082,18 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent              Ausgabe eingerückt darstellen\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict              .po-Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3118,12 +3116,12 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden kumuliert.  Bei Verwendung\n"
 "der Option --unique werden doppelte Einträge verworfen.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 nur doppelte Einträge ausgeben\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3226,7 +3224,7 @@ msgstr "Pluralform hat einen falschen Index"
 msgid "too many errors, aborting"
 msgstr "zu viele Fehler: Abbruch"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ungültige Multibyte-Sequenz"
@@ -3270,7 +3268,7 @@ msgstr "Zeilenende innerhalb einer Zeichenkette"
 msgid "context separator <EOT> within string"
 msgstr "Kontext-Trenner <EOT> innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
@@ -3456,35 +3454,35 @@ msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
 msgid "standard output"
 msgstr "Standardausgabe"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Fehler beim Anlegen von Verzeichnis »%s«"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kein gültiger Name einer Java-Klasse: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
 "--verbose oder setzen Sie $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3497,14 +3495,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
 
-#: src/write-po.c:803
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
 
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3518,7 +3516,7 @@ msgstr ""
 "ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3604,7 +3602,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Pluralbehandlung\n"
 
-#: src/x-awk.c:341 src/x-python.c:1072
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
@@ -3624,7 +3622,7 @@ msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:224 src/xgettext.c:1961
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3681,7 +3679,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1279
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
@@ -3727,32 +3725,32 @@ msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: »%s« zum Terminieren der Zeichenkette ist vor EOF nicht vorhanden"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: rechte Klammer bei \\x{HEXZAHL} fehlt"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\l«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\u«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ungültige Interpolation einer Variablen bei »%c«"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\L«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\U«) bei dem 8-Bit-Zeichen »%c«"
@@ -3834,7 +3832,7 @@ msgstr ""
 "angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:677
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
@@ -3863,32 +3861,32 @@ msgstr ""
 "%s:%lu: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet "
 "zu betrachten; verwenden Sie stattdessen use eval_gettext"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
 "geschrieben wird"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3896,25 +3894,25 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME  Ausgabe in NAME.po (anstatt in messages.po)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=DATEI         Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=VERZ      Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3932,12 +3930,12 @@ msgstr ""
 "                                   PHP, GCC-source, NXStringTable, RST, "
 "Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3947,7 +3945,7 @@ msgstr ""
 "Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3956,24 +3954,24 @@ msgstr ""
 "      --from-code=NAME           Kodierung der Eingebedateien\n"
 "                                   (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Die Vorgabe ist, dass für Eingabedateien ASCII angenommen wird.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            Meldungen an existierende Datei anhängen\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DATEI.po    Einträge aus DATEI.po nicht herausholen\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3986,17 +3984,17 @@ msgstr ""
 "Zeilen\n"
 "                                   vor einem Schlüsselwort) herausschreiben\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4009,7 +4007,7 @@ msgstr ""
 "                                 EmacsLisp, librep, Scheme, Java, C#, awk,\n"
 "                                 Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -4019,7 +4017,7 @@ msgstr ""
 "                               wird (ohne WORT-Angabe wird nicht nach den\n"
 "                               vorgegebenen Schlüsselwörtern gesucht)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4031,7 +4029,7 @@ msgstr ""
 "                                der Argumentzahl ARG des Schlüsselworts "
 "WORT\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4045,43 +4043,43 @@ msgstr ""
 "                                   librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
 "                                   Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs            Trigraph-Zeichen von ANSI C bei der Eingabe\n"
 "                               erkennen\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                   (nur die Programmiersprachen C, C++,\n"
 "                                   ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                     Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                 (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 "      --kde                     Zeichenketten im KDE 4-Format erkennen\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                  Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4089,19 +4087,19 @@ msgstr ""
 "  --debug                    detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     eine ».properties«-Datei von Java erstellen\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4109,24 +4107,24 @@ msgstr ""
 "      --foreign-user            keine Zeile mit FSF-Copyright in Ausgabe\n"
 "                                  einfügen\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    Paketname für die Ausgabe setzen\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESSE  Adresse für msgid-Fehler angeben\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4136,7 +4134,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=KETTE]   KETTE oder \"\" als Präfix für msgstr "
 "nehmen\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4146,7 +4144,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KETTE]   KETTE oder \"\" als Suffix für msgstr "
 "nehmen\n"
 
-#: src/xgettext.c:1723
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4155,31 +4153,31 @@ msgstr ""
 "Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: "
 "%s"
 
-#: src/xgettext.c:1822
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:1926
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1930
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1935
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2040 src/xgettext.c:2073 src/xgettext.c:2135
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: Warnung: "
 
-#: src/xgettext.c:2043
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4188,7 +4186,7 @@ msgstr ""
 "Obwohl das Formatelement an der Position eines Formatelements verwendet "
 "wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2044
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4197,7 +4195,7 @@ msgstr ""
 "Obwohl es als Formatelement deklariert wurde, ist %s kein gültiges %s "
 "Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4211,7 +4209,7 @@ msgstr ""
 "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
 "und einem Mapping anstelle eines Tuples für die Argumente.\n"
 
-#: src/xgettext.c:2137
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4221,28 +4219,28 @@ msgstr ""
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:2774
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:2801
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:2826
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "Warnung: fehlender Kontext für das Plural-Argument des Schlüsselwortes »%.*s«"
 
-#: src/xgettext.c:2847
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
 
-#: src/xgettext.c:2956
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4254,7 +4252,7 @@ msgstr ""
 "Variable MSGID_BUGS_ADDRESS aus; falls nicht, geben Sie bitte die\n"
 "Option an der Befehlszeile mit --msgid-bugs-address an.\n"
 
-#: src/xgettext.c:3166
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
@@ -4263,6 +4261,12 @@ msgstr "Programmiersprache »%s« unbekannt"
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: unzulässige Option -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle ist mit dem Exitcode 0x%08x fehlgeschlagen"
+
 #~ msgid "Not yet implemented."
 #~ msgstr "Noch nicht implementiert."
 

diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index 57015b5572d01aa2eaa66a1c8755496ceba945a2..e857bb585e4316399ae15bfec010356ab70be6dd 100644 (file)
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,25 +32,25 @@ msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "áäõíáìßá åðéóôñïöÞò óôï êáôÜëïãï \"%s\""
@@ -59,48 +60,48 @@ msgid "write error"
 msgstr ""
 
 #
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
 #
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
 #
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -111,85 +112,84 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 #
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `--%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `%c%s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
 
 #
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `--%s'\n"
 
 #
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ìç áíáãíùñßóéìç åðéëïãÞ `%c%s'\n"
 
 #
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
-
-#
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ç åðéëïãÞ áðáéôåß ðáñÜìåôñï -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
 
 #
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé ðáñÜìåôñï\n"
 
+#
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -201,21 +201,21 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -225,22 +225,22 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ìíÞìç åîáíôëÞèçêå"
 
 #
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -259,73 +259,73 @@ msgstr "
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #: src/format-boost.c:449
@@ -351,9 +351,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
@@ -394,48 +394,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -528,21 +528,20 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -556,11 +555,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -609,14 +608,14 @@ msgstr ""
 #
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #: src/format-perl.c:433
@@ -627,60 +626,57 @@ msgid ""
 msgstr ""
 
 #
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 #
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -717,11 +713,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -731,40 +727,40 @@ msgid ""
 msgstr ""
 
 #
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -797,29 +793,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -829,11 +825,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
@@ -844,297 +840,315 @@ msgid "could not get host name"
 msgstr ""
 
 #
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
 #
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1152,33 +1166,33 @@ msgstr ""
 "  -S, --strict             ìïñöÞ åîüäïõ ôï áõóôçñü Uniforum\n"
 "  -V, --version            åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
 #
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
 #
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1208,108 +1222,100 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
 #
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "äåí êáèïñßóôçêáí áñ÷åßá åéóüäïõ"
 
 #
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1335,88 +1341,93 @@ msgstr ""
 "Ý÷ïõí ìåôáöñáóôåß. Åêåß ðïõ äåí åíôïðßæåôáé áêñéâÞò áíôéóôoé÷ßá,\n"
 "ãßíåôáé åëáóôéêü ôáßñéáóìá ãéá êáëýôåñá áðïôåëÝóìáôá.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
 #
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé..."
 
 #
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...áëëÜ áõôüò ï ïñéóìüò åßíáé ðáñüìïéïò"
 
 #
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
 #
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá"
 
 #
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
 
 #
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1445,76 +1456,76 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 #
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
 #
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1523,23 +1534,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1549,69 +1560,69 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
 #
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1619,210 +1630,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
 #
-#: src/msgfmt.c:599
+#: src/msgfmt.c:620
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá"
 
 #
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1832,48 +1825,48 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1881,33 +1874,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1915,67 +1908,67 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
 
 #
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -1983,57 +1976,57 @@ msgstr ""
 "ãßíåé ÷ñÞóç ðñïèÝìáôïò"
 
 #
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2073,30 +2066,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2104,24 +2097,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2129,54 +2122,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2188,54 +2181,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2244,7 +2237,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2253,7 +2246,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2262,12 +2255,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2275,7 +2268,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2284,7 +2277,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2292,66 +2285,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2359,140 +2352,140 @@ msgstr[0] "
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
 
 #
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ôï ðåäßá êåöáëßäáò `%s' èá Ýðñåðå íá îåêéíÜ óôçí áñ÷Þ ôçò ãñáììÞò"
 
 #
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
 #
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
 #
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2518,51 +2511,51 @@ msgstr ""
 "Ôá áðïôåëÝóìáôá ãñÜöïíôáé óôçí êáíïíéêÞ Ýîïäï åêôüò êáé áí ïñßæåôáé\n"
 "êÜðïéï áñ÷åßï åîüäïõ.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2574,7 +2567,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2582,36 +2575,31 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 #
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2621,62 +2609,64 @@ msgstr ""
 "Ý÷ïõí ðáñáëçöèåß %d, á÷ñçóéìïðïßçôá %d.\n"
 
 #
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " Ýãéíå.\n"
 
 #
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2685,41 +2675,41 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2732,19 +2722,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2829,75 +2819,75 @@ msgid "plural form has wrong index"
 msgstr ""
 
 #
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "ðÜñá ðïëëÜ óöÜëìáôá, åãêáôáëåßðù"
 
 #
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Üãíùóôç åíôïëÞ \"%s\""
 
 #
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "ôÝëïò áñ÷åßïõ (EOF) óôï áëöáñéèìçôéêü"
 
 #
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "ôÝñìá-ãñáììÞò (eol) óôï áëöáñéèìçôéêü"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
 
 #
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "åðáíáëáìâáíüìåíïò ïñéóìüò ìçíýìáôïò"
 
 #
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
 
@@ -2999,17 +2989,17 @@ msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
 #
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3017,11 +3007,26 @@ msgid ""
 msgstr ""
 
 #
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3054,43 +3059,43 @@ msgid ""
 msgstr ""
 
 #
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "êáíïíéêÞ Ýîïäïò"
 
 #
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "áäõíáìßá áëëáãÞò óôï êáôÜëïãï \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3102,15 +3107,15 @@ msgid "error while opening \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
 #
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\%"
-"c'"
+"ôá ìçíýìáôá ðñïò ìåôÜöñáóç äåí ðñÝðåé íá ðåñéÝ÷ïõí ôï ÷áñáêôÞñá äéáöõãÞò `\\"
+"%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3119,7 +3124,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3136,8 +3141,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3155,13 +3160,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "óöÜëìá óôçí åããñáöÞ ôïõ áñ÷åßïõ \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3180,70 +3185,67 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 
 #
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3251,33 +3253,33 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 
 #
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3285,56 +3287,54 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
 #
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ìç Ýãêõñç åðéëïãÞ -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3342,7 +3342,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3350,7 +3350,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3358,7 +3358,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3366,7 +3366,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3374,28 +3374,28 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 #
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3403,55 +3403,55 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí "
 "êáíïíéêÞ Ýîïäï"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3463,58 +3463,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3523,14 +3526,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3538,7 +3541,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3547,120 +3550,137 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
 #
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "êáíïíéêÞ åßóïäïò"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3669,34 +3689,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3705,7 +3725,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
@@ -3714,6 +3734,15 @@ msgstr "
 msgid "<unnamed>"
 msgstr ""
 
+#
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ìç áðïäåêôÞ åðéëïãÞ -- %c\n"
+
+#
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "ôï ðåäßï `%s' Ý÷åé áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
+
 #
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -3880,8 +3909,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 8356bf0527030638a5ed6c070006aec722a1969e..5bde6e77318781e39ba52f5f7a7461faccec69cf 100644 (file)
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2005-06-27 17:09-0500\n"
 "Last-Translator: Max de Mendizábal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,22 +32,22 @@ msgstr "el argumento %s es ambiguo para %s"
 msgid "Valid arguments are:"
 msgstr "Los argumentos válidos son:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
@@ -55,44 +56,44 @@ msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 msgid "write error"
 msgstr "error de escritura"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error al escribir \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error después de leer \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fallo en fdopen()"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "No se encontró al compilador de C#, intente instalar pnet"
@@ -104,76 +105,73 @@ msgstr "No se encontr
 
 # Nota: El error es del sistema, pero no se sabe cuál es el error,
 # por eso es (además) desconocido.
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "fallo en el subproceso %s"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opción no reconocida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opción no reconocida `%c%s'\n"
 
-# acepto la sugerencia de em en cuanto a que inválida parece cárcel
-# o inútil pero mejor puse inválida
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción inválida -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: la opción requiere un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: la opción `-W %s' es ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: la opción `%s' requiere un argumento\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,20 +183,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "hubo un error al escribir el fichero \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -211,20 +209,20 @@ msgstr ""
 "No se encontró a la máquina virtual de Java, intente instalar gij o poner "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -243,75 +241,72 @@ msgstr "no se puede crear la tuber
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-"fallo de duplicación de manejador (DuplicateHandle) con código de error 0x%"
-"08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "fallo en _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "no se puede crear el fichero de salida \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "subproceso %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s tiene una señal fatal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' no es un formato de cadena válido %s, a diferencia de 'msgid'. Razón: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "una especificación de formato para el argumento %u, como en '%s', no existe "
 "en 'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento %u no existe en '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
 "son las mismas"
@@ -346,9 +341,9 @@ msgstr ""
 "La cadena se refiere al argumento número %u, pero ignora el argumento número "
 "%u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el número de especificaciones de formato en `msgid' y '%s' no coincide"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -396,18 +391,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La cadena contiene un '}' solitario posterior a la instrucción %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -416,7 +411,7 @@ msgstr ""
 "En la instrucción número %u, el número de argumento 0 no es un entero "
 "positivo."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -424,25 +419,25 @@ msgid ""
 msgstr ""
 "En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "En la instrucción número %u, el argumento %d es negativo."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 "En la instrucción número %u, las banderas no están permitidas antes de '%c'."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' utiliza %%m pero '%s' no"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' no utiliza %%m pero '%s' utiliza %%m"
 
 #: src/format-invalid.h:22
@@ -553,23 +548,22 @@ msgstr ""
 "seguido por '<', '#' o '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "una especificación de formato para el argumento {%u}, como en '%s', no "
 "existe en 'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento {%u} no existe en '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento {%u} no "
 "son las mismas"
@@ -587,11 +581,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "En la instrucción número %u se dieron demasiados parámetros; se espera a lo "
 "más %u parámetro."
@@ -644,13 +638,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "La cadena se refiere a algún argumento de forma incompatible."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "las especificaciones de formato en '%s' no son un subconjunto de aquellas en "
 "'msgid'"
@@ -664,12 +658,12 @@ msgstr ""
 "En la instrucción número %u, el  tamaño del especificador es incompatible "
 "con el especificador de conversión '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -677,43 +671,40 @@ msgstr ""
 "La cadena se refiere a ambos argumentos a través de números de argumento "
 "absolutos y a través de especificaciones de argumentos no numerados."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La cadena se refiere al argumento denominado '%s' en formas incompatibles."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "las especificaciones de formato en `msgid' requieren un mapeo, y aquellas en "
 "'%s' requieren una tupla"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "las especificaciones de formato en `msgid' requieren una tupla y aquellas en "
 "'%s' requieren un mapeo"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "una especificación de formato para el argumento '%s', como en '%s', no "
 "existe en 'msgid'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
 "son las mismas"
@@ -721,8 +712,8 @@ msgstr ""
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -766,11 +757,11 @@ msgid ""
 msgstr ""
 "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -779,38 +770,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para más información.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN]\n"
@@ -847,29 +838,29 @@ msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 "  -i, --ip-address            direcciones para el nombre de la máquina\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
@@ -878,11 +869,11 @@ msgstr "  -V, --version               muestra la versi
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -891,30 +882,30 @@ msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "no se pudo obtener el nombre de la máquina"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "sólo se permite un fichero de entrada máximo"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -923,10 +914,10 @@ msgstr ""
 "Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
 "atributos, y luego manipula los atributos.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -935,23 +926,23 @@ msgstr ""
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localización del fichero de entrada:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHERODEENTRADA            fichero PO de entrada\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -960,33 +951,33 @@ msgstr ""
 "ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
 "estándar.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localización del fichero de salida:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -995,12 +986,12 @@ msgstr ""
 "Los resultados se escriben a la salida estándar si no se especifica ningún\n"
 "fichero de salida o si es -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaje:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1008,7 +999,7 @@ msgstr ""
 "     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1016,61 +1007,61 @@ msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              elimina los mensajes difusos marcados como "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene los mensajes difusos marcados con "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulación de atributos:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1079,7 +1070,7 @@ msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1087,7 +1078,7 @@ msgstr ""
 "      --only-file=FICHERO.po  manipula sólo las entradas enlistadas en el "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1095,28 +1086,28 @@ msgstr ""
 "      --ignore-file=FICHERO.po  manipula sólo las entradas no listadas en "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintáxis del fichero de entrada:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1124,8 +1115,8 @@ msgstr ""
 "  -P, --properties-input      el fichero de entrada está en la sintáxis de ."
 "properties de Java\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1134,17 +1125,35 @@ msgstr ""
 "    --stringtable-input     el fichero de entrada está en la sintáxis de ."
 "strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1152,9 +1161,9 @@ msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
 "omisión)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1162,55 +1171,55 @@ msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
 "carácteres extendidos\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              escribe un fichero PO aún si está vacío\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando estilo con "
 "sangrados\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location       genera líneas '#: fichero:línea' (por omisión)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1218,16 +1227,16 @@ msgstr ""
 "     --stringtable-output     escribe un fichero .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          pone la anchura de la página de salida\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1238,32 +1247,32 @@ msgstr ""
 "                              sean mayores a la anchura de la página de "
 "salida\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordena la salida por ubicación de fichero\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1289,25 +1298,25 @@ msgstr ""
 "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
 "los ficheros PO se conservarán.  \n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHERODEENTRADA ...        ficheros de entrada\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHERO    obtiene una lista de ficheros de entrada del "
 "FICHERO\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1318,7 +1327,7 @@ msgstr ""
 "                              definiciones, si no se especifica, es "
 "infinito\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1328,7 +1337,7 @@ msgstr ""
 "de\n"
 "                              definiciones, si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1337,8 +1346,8 @@ msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
 "                              que sólo se impriman los mensajes únicos\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1346,8 +1355,8 @@ msgstr ""
 "  -P, --properties-input      los ficheros de entrada están en la sintáxis ."
 "properties de Java\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1356,12 +1365,12 @@ msgstr ""
 "      --stringtable-input     los ficheros de entrada están en la sintáxis\n"
 "                              .strings de NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOMBRE        codifica para la salida\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1370,36 +1379,28 @@ msgstr ""
 "      -use-first              utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "no se especificaron ficheros de entrada"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "se requieren exactamente 2 ficheros de entrada"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1464,7 +1465,7 @@ msgstr "Modo de empleo: %s [OPCI
 # y en otros de otra (la frase no era exactamente igual).
 # 11061996mm: En particular en gettext el letrero es estándar, por lo que
 # prefiero "también son" que, creo suena mejor. Homogeinizo todo.
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1483,22 +1484,22 @@ msgstr ""
 "se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
 "tal forma que la precisión del diagnóstico sea mejor.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traducciones\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.po                      referencias a las fuentes\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificadores de operación:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1507,45 +1508,50 @@ msgstr ""
 "  -m, --multi-domain          aplica ref.pot a cada uno de los dominios en\n"
 "                              def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     no utiliza la coincidencia difusa\n"
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atención: este mensaje no se utiliza"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "este mensaje se usa pero no está definido..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...pero esta definición es parecida"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "este mensaje se usa pero no está definido en %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atención: este mensaje no se utiliza"
@@ -1571,19 +1577,19 @@ msgstr "atenci
 #
 # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
 # aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "se encontró el error fatal %d"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "se deben especificar por lo menos dos ficheros"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1606,7 +1612,7 @@ msgstr ""
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
 "conservarán.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1616,45 +1622,45 @@ msgstr ""
 "                              número de definiciones, si no se pone,\n"
 "                              el valor por omisión es 0\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "     --omit-header          no escribe la línea de encabezado `msgid \"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Convierte un catálogo de traducción a una codificación de carácteres "
 "distinta.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Blanco de conversión:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "La codificación por omisión es la que está en uso por la funcion locale.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                estilo de salida con sangrías\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1662,29 +1668,29 @@ msgstr ""
 "      --add-location          genera líneas '#: fichero:línea' (por "
 "omisión)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "no se especificó el fichero de entrada"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "se requieren exactamente un ficheros de entrada"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1697,22 +1703,22 @@ msgstr ""
 "(generalmente creado por xgettext). Las entradas no traducidas son\n"
 "asignadas a una traducción que es idéntica a la del msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHEROENTRADA              fichero de entrada PO o POT\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "Se omitió el nombre de la instrucción"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1728,7 +1734,7 @@ msgstr ""
 "msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n"
 "todas las invocaciones.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1738,43 +1744,43 @@ msgstr ""
 "traducción, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
 "utilizar como entrada para \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero PO de entrada\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "fallo en la escritura a la salida estándar"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "falta el nombre del filtro"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "se debe especificar al menos un guión de sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1783,12 +1789,12 @@ msgstr ""
 "El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
 "estándar y escriba una traducción modificada a la salida estándar.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1796,7 +1802,7 @@ msgstr ""
 "  -e, --expression=GUIÓN       añade un GUIÓN a las instrucciones que serán\n"
 "                               ejecutadas\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1806,7 +1812,7 @@ msgstr ""
 "  -f, --file=FICHEROGUIÓN     añade el contenido del FICHEROGUIÓN a las\n"
 "                              instrucciones que serán ejecutadas\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1814,7 +1820,7 @@ msgstr ""
 "  -n, --quiet, --silent        elimina la impresión automática del espacio\n"
 "                               de patrones\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1822,13 +1828,13 @@ msgstr ""
 "      --no-escape             no utiliza las secuencias de escape tipo C\n"
 "                              en la salida (por omisión)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1837,101 +1843,83 @@ msgstr ""
 "modificación,\n"
 "                              es decir, no la filtra\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Aún no está implementado."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "fallo en la comunicación con el subproceso %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "fallo en la lectura del subproceso %s"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "el subproceso %s terminó con un código de salida %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "el argumento a %s debe ser un solo carácter de puntuación"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requiere que se especifique un \"-d directorio\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requiere que se especifique un \"-l local\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sólo es válido con %s o %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sólo es válido con %s, %s o %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traducciones difusas"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaje sin traducir"
 msgstr[1] ", %d mensajes sin traducir"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catálogo binario de mensajes a partir de la descripción de la "
 "traducción textual.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1940,17 +1928,17 @@ msgstr ""
 "Los argumentos obligatorios en las opciones largas también lo son para las \n"
 "opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...             ficheros de entrada\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1959,7 +1947,7 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1968,13 +1956,13 @@ msgstr ""
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                Modo C#: genera un fichero .dll de .NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1983,40 +1971,40 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Modo tcl: genera un fichero .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fichero de salida es -,  se escribe en la salida estándar.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localización del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nombre del recurso\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2024,14 +2012,14 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2043,12 +2031,12 @@ msgstr ""
 "recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
 "se escribe bajo el directorio especificado.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localización del fichero de salida en modo C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2057,7 +2045,7 @@ msgstr ""
 "  -d DIRECTORIO               directorio base de los ficheros .dll de "
 "dependencias locales\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2067,19 +2055,19 @@ msgstr ""
 "un subdirectorio del directorio especificado cuyo nombre dependerá de la "
 "localización.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localización del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de los catálogos de\n"
 "                              mensajes .msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2088,12 +2076,12 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretación del fichero de entrada:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2104,7 +2092,7 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
@@ -2112,7 +2100,7 @@ msgstr ""
 "del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2121,7 +2109,7 @@ msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
 "                              línea de encabezado\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2131,7 +2119,7 @@ msgstr ""
 "instrucciones\n"
 "                              del dominio y la opción --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2141,7 +2129,7 @@ msgstr ""
 "el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2151,13 +2139,13 @@ msgstr ""
 "       --check-accelerators[=CAR]  revisa la presencia de aceleradores de\n"
 "                                   teclado para los elementos del menú\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2165,7 +2153,7 @@ msgstr ""
 "   -a, --alignment=NÚMERO      alinea las cadenas al NÚMERO de bytes\n"
 "                               (por omisión es: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2173,52 +2161,52 @@ msgstr ""
 "      --no-hash               el fichero binario no incluirá la tabla de "
 "hash\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            muestra las estadísticas sobre las "
 "traducciones\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta el cantidad de mensajes\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "atención: el encabezado del fichero PO está difuso\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
 "se utilizará un prefijo"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "la instrucción `domain %s' no tiene efecto"
@@ -2227,35 +2215,35 @@ msgstr "la instrucci
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "se descarta la línea vacía `msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "se descarta la línea difusa `msgstr'"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2264,7 +2252,7 @@ msgstr ""
 "la opción '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
 "especificadas"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2273,7 +2261,7 @@ msgstr ""
 "Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
 "patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2348,7 +2336,7 @@ msgstr ""
 "-f, --file=FICHERO           obtiene al PATRÓN del FICHERO\n"
 "-i, --ignore-case            indistingue si es mayúsculas o minúsculas\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2357,18 +2345,18 @@ msgstr ""
 "caracteres\n"
 "                              extendidos\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera una salida ordenada\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          ordena la salida por localización de ficheros\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2378,7 +2366,7 @@ msgstr ""
 "de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
 "es necesario para que se puedan probar las traducciones.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2389,12 +2377,12 @@ msgstr ""
 "Favor de especificar el formato local a través de la opción --locale o\n"
 "el fichero de salida .po a través de la opción --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creado %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2403,12 +2391,12 @@ msgstr ""
 "Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
 "tomados del entorno del usuario.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2418,13 +2406,13 @@ msgstr ""
 "Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
 "actual. Si es -, se lee la entrada estándar.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2434,13 +2422,13 @@ msgstr ""
 "de la selección local del usuario. Si es -, los resultados se escriben en\n"
 "la salida estándar.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 "   -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2448,7 +2436,7 @@ msgstr ""
 "      --no-translator         supone que el fichero PO será generado\n"
 "                              automáticamente\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2457,12 +2445,12 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error en la lectura del directorio actual"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2471,14 +2459,14 @@ msgstr ""
 "Favor de especificar el fichero .pot de entrada utilizando la opción --"
 "input\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "fallo en el subproceso %s con código de salida %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2494,26 +2482,26 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
 "portátil"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 "hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
 "entrada"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2521,7 +2509,7 @@ msgstr ""
 "el fichero de entrada `%s' no contiene una línea de encabezado con la "
 "especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2530,21 +2518,21 @@ msgstr ""
 "el dominio \"%s\" en el fichero de entrada `%s' no contiene una línea de\n"
 "encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
 "portátil."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "atención: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2553,7 +2541,7 @@ msgstr ""
 "Los ficheros de entrada contienen mensajes en distintas codificaciones,\n"
 "UTF-8 entre otras. Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2565,7 +2553,7 @@ msgstr ""
 "%s y %s entre otras.\n"
 "Por ello se convierte la salida a UTF-8.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2574,7 +2562,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2587,12 +2575,12 @@ msgstr ""
 "La salida de '%s' podría ser incorrecta.\n"
 "Las posibles alternativas son:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Poner LC_ALL como local con la codificación %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2603,7 +2591,7 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2616,7 +2604,7 @@ msgstr ""
 "  y luego aplicar '%s',\n"
 "  y luego reconvertirlo a %s utilizando 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2628,26 +2616,26 @@ msgstr ""
 "La salida de '%s' podría ser incorrecta.\n"
 "Una alternativa posible s poner LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu pero las expresiones plurales pueden producir valores tan "
 "grades como %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir un sobreflujo entero"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2655,54 +2643,54 @@ msgstr ""
 "la expresión plural puede producir excepciones aritméticas, posiblemente una "
 "división por cero"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu ..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "... pero algunos mensajes sólo tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes sólo tienen %lu formas plurales"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
 msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2726,7 +2714,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
@@ -2747,7 +2735,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
@@ -2769,81 +2757,81 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' inicial"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "a alguna de las líneas `msgid' y `msgid_plural' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "a alguna de las líneas `msgid' y `msgstr' les falta el `\\n' final"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "el manejo del plural es una extensión del gettext de GNU"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "no existe el campo `%s' en la cabecera\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "el campo de encabezado `%s' debe comenzar al principio de la línea\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "algunos campos de cabecera aún tienen el valor inicial por omisión\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "el campo `%s' aún tiene el valor inicial por omisión\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "algunos campos de cabecera aún tienen el valor inicial por omisión\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "El fichero de entrada no contiene una línea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2852,7 +2840,7 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
 "no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2861,8 +2849,8 @@ msgstr ""
 "La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
 "distintos se vuelven iguales."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2871,16 +2859,16 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
 "Esta versión fue construida sin iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sólo es válido con %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipo de respaldo"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2903,19 +2891,19 @@ msgstr ""
 "haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
 "para obtener mejores resultados.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traducciones que se refieren a las viejas "
 "fuentes\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencias a las nuevas fuentes\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2925,7 +2913,7 @@ msgstr ""
 "mensajes,\n"
 "                              puede ser especificada más de una vez\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2934,27 +2922,27 @@ msgstr ""
 "   -U, --update                actualiza def.po,\n"
 "                               no hace nada si def.po ya está actualizado\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Localización del fichero de salida en modo de actualización:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "El resultado se escribió sobre def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        hace un respado de def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIJO         sobreescribe el sufijo de respaldo\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2975,7 +2963,7 @@ msgstr ""
 "                   no es así\n"
 "   simple, never   siempre hace backups sencillos\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2985,12 +2973,7 @@ msgstr ""
 "El sufijo del respaldo es `~', a menos que se modifique con --suffix o con\n"
 "la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     no utiliza la coincidencia difusa\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2998,22 +2981,22 @@ msgstr ""
 "     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprime los indicadores de progreso\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "este mensaje debería definir las formas plurales"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "este mensaje no debería definir las formas plurales"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3023,28 +3006,30 @@ msgstr ""
 "incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
 
 # Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " terminado.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
 "po.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -3053,14 +3038,14 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java \n"
 "                              ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                Modo C#: la entrada es un fichero .dll de ."
 "NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -3069,7 +3054,7 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -3077,17 +3062,17 @@ msgstr ""
 "      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/"
 "msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHERO ...                 ficheros .mo de entrada\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Localización del fichero de entrada en modo Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -3098,12 +3083,12 @@ msgstr ""
 "recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
 "variable de entorno CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Localización del fichero de entrada en modo C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3113,12 +3098,12 @@ msgstr ""
 "un subdirectorio del directorio especificado cuyo nombre depende de la "
 "configuración local.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Localización del fichero de entrada en modo Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3127,18 +3112,18 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando sangrías\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3161,12 +3146,12 @@ msgstr ""
 "ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
 "duplicados se descartan.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3176,7 +3161,7 @@ msgstr ""
 "a\n"
 "                                  los duplicados\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -3297,51 +3282,51 @@ msgstr "la primera forma del plural tiene un 
 # 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
 # hablar en primera persona sino en estilo impersonal.
 # (Esta regla estará en el manual de Enrique, con toda seguridad).
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados errores, programa interrumpido"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sucesión de multibyte inválida"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sucesión de multibyte inválida al final del fichero"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sucesión de multibyte inválida al final de la línea"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "fallo en iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra clave \"%s\" desconocida"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de fichero dentro de una cadena"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de línea dentro de una cadena"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
@@ -3377,17 +3362,17 @@ msgstr ""
 # mente el verbo poder en Castellano es mucho más flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
 
 # Nota: es la definición la que está duplicada.
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definición del mensaje duplicada"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...aquí está la primera definición"
@@ -3480,17 +3465,17 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "se esperan dos argumentos"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3499,11 +3484,26 @@ msgstr ""
 "Trae y muestra el contenido de una URL. Si la URL no puede ser accesada,\n"
 "se utiliza el FICHERO local.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error al escribir la salida estándar"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 #, fuzzy
 msgid ""
@@ -3549,42 +3549,42 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el "
 "catálogo de mensajes no admite el trato plural"
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "no se puede crear el fichero de salida \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "salida estándar"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "fallo al crear el directorio \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "fallo en la compilación de la clase C#, intente --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "fallo en la compilación de la clase C#, intente --verbose"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "no es un nombre de clase Java válido: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3595,7 +3595,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3603,7 +3603,7 @@ msgstr ""
 "Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
 "%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3616,7 +3616,7 @@ msgstr ""
 "caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
 "en ASCII puro. %s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3640,8 +3640,8 @@ msgstr ""
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3666,7 +3666,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "hubo un error al escribir al subproceso %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3675,7 +3675,7 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "formato de los recursos de C# no tiene implementado el trato plural\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3700,36 +3700,34 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Hay una cadena que no está en ASCII en %s%s.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3738,7 +3736,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3747,7 +3745,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3756,7 +3754,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3765,12 +3763,12 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3779,32 +3777,32 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: atención: carácter Unicode inválido"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: atención: cadena constante no finalizada"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3813,59 +3811,58 @@ msgstr ""
 "El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
 "Esta versión fue construida sin expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
 "antes del fin del fichero"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\u\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolación de variable no válida en \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Hay una cadena que no está en ASCII en %s%s.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3875,7 +3872,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3885,7 +3882,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3895,7 +3892,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3905,7 +3902,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3915,27 +3912,27 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definición de cadena inválida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: falta un número después del símbolo #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresión de cadena inválida"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3944,32 +3941,32 @@ msgstr ""
 "%s:%lu: cuidado: la sintáxis $\"...\" se desaconseja debido a cuestiones de "
 "seguiridad; mejor utilice eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
 "salida estándar (stdout)"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "atención: el fichero `%s' con extensión `%s'\n"
 "es desconocido; se intentará tipo C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3978,13 +3975,13 @@ msgstr ""
 "  -d, --default-domain=NOMBRE   utiliza NOMBRE.po para la salida (en vez de\n"
 "                                mensajes.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3993,12 +3990,12 @@ msgstr ""
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4018,12 +4015,12 @@ msgstr ""
 "PHP,\n"
 "                                  fuente-GCC, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4032,7 +4029,7 @@ msgstr ""
 "Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4041,45 +4038,48 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Por omisión, los ficheros de entrada se presupone que están en ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHERO.po  las líneas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ETIQUETA]  comenta un bloque con la ETIQUETA (o\n"
 "                                 aquellas líneas que preceden a la palabra\n"
 "                                 clave) en el fichero de salida\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opciones específicas del lenguaje:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4093,11 +4093,11 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, fuente-GCC, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "   -k, --keyword[=PALABRA]     una palabra clabe adicional que se debe "
 "buscar \n"
@@ -4105,7 +4105,7 @@ msgstr ""
 "utilizar \n"
 "                               las palabras clave por omisión)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4118,7 +4118,7 @@ msgstr ""
 "palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4132,40 +4132,40 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, fuente-GCC)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs              entiende los trígrafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sólo en lenguajes C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sólo lenguaje C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4173,18 +4173,18 @@ msgstr ""
 "      --debug                  muestra con más detalle el reconocimiento\n"
 "                               de las cadenas de formato\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4192,18 +4192,18 @@ msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4211,45 +4211,62 @@ msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "   -m, --msgstr-prefix[=CADENA]   utiliza la CADENA o \"\" como prefijo para "
 "las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=CADENA]  utiliza la CADENA o \"\" como sufijo para "
 "las\n"
 "                                líneas del msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Un argumento --flag no tiene la sintáxis <palabraclave>:<númarg>:[pass-]"
 "<bandera>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: atención: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4258,16 +4275,16 @@ msgstr ""
 "Aunque se utilizó en una posición de formato de cadena, el %s no se un "
 "formato de cadena válido %s. La razón es: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
 "%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4276,7 +4293,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4286,27 +4303,27 @@ msgstr ""
 "gettext(\"\") regresa la línea de encabezado con la\n"
 "metainformación, no una cadena vacía.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "el argumento %s es ambiguo para %s"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4318,7 +4335,7 @@ msgstr ""
 "allí la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
 "debe se poner la opción --msgid-bugs-address\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconocido"
@@ -4327,6 +4344,34 @@ msgstr "idioma `%s' desconocido"
 msgid "<unnamed>"
 msgstr "<sinnombrar>"
 
+# acepto la sugerencia de em en cuanto a que inválida parece cárcel
+# o inútil pero mejor puse inválida
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción inválida -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr ""
+#~ "fallo de duplicación de manejador (DuplicateHandle) con código de error 0x"
+#~ "%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Aún no está implementado."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "fallo en la comunicación con el subproceso %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "fallo en la lectura del subproceso %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "el subproceso %s terminó con un código de salida %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "el campo `%s' aún tiene el valor inicial por omisión\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Referencias múltiples a %%%c."
 

diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 56e0be1c27312ca328033a475462e9481b8feb13..094ae48885dd2323dde6bc04ba380e3fa39fb293 100644 (file)
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,22 +30,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
@@ -53,44 +54,44 @@ msgstr "ei suuda luua v
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -100,74 +101,73 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemne viga"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: võti `%s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `--%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: võtmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: võtme `%s' järel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu võti `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu võti `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: lubamatu võti -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane võti -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: võtme järel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: võti `-W %s' on mitmetähenduslik\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: võtmel `-W %s' ei tohi olla argumente\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: võtme `%s' järel peab olema argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -179,20 +179,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -202,20 +202,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "mälu sai otsa"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -234,70 +234,69 @@ msgstr "ei suuda luua v
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ei suuda luua väljundfaili \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-boost.c:449
@@ -322,9 +321,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -364,48 +363,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -497,19 +496,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -523,11 +521,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -575,12 +573,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-perl.c:433
@@ -590,54 +588,51 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -674,11 +669,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -687,38 +682,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -751,29 +746,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -782,11 +777,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
@@ -796,294 +791,312 @@ msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1104,31 +1117,31 @@ msgstr ""
 "  -V, --version            väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER       määrab väljastatava lehekülje laiuse\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1156,105 +1169,97 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "sisendfailid on määramata"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1280,81 +1285,86 @@ msgstr ""
 "teated on tõlgitud. Kui täpseid vasteid ei suudeta leida, kasutatakse parema\n"
 "diagnoosi huvides määratlust 'kahtlane'.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "see teade on kasutusel, kuid kirjeldamata..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...kuid see kirjeldus on sarnane"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "leitud %d tõsine viga"
 msgstr[1] "leitud %d tõsist viga"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "vähemalt kaks faili peab olema ette antud"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1381,74 +1391,74 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on määramata"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1457,22 +1467,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumendid on puudu"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1482,67 +1492,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumendid on puudu"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "vähemalt kaks faili peab olema ette antud"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1550,210 +1560,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d tõlgitud teade"
 msgstr[1] "%d tõlgitud teadet"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d kahtlane tõlge"
 msgstr[1] ", %d kahtlast tõlget"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d tõlkimata teade"
 msgstr[1] ", %d tõlkimata teadet"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1762,48 +1754,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1811,33 +1803,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1845,115 +1837,115 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin tühja `msgstr' kirjet"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1993,30 +1985,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2024,24 +2016,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2049,54 +2041,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2108,54 +2100,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2164,7 +2156,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2173,7 +2165,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2182,12 +2174,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2195,7 +2187,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2204,7 +2196,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2212,157 +2204,157 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "päise kirjest on puudu väli `%s'"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "päise kirjes peab väli `%s' algama rea algusest"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "väli `%s' sisaldab ikka veel algset väärtust"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2371,15 +2363,15 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2388,16 +2380,16 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2424,51 +2416,51 @@ msgstr ""
 "kahtlased. Kui väljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
 "standardväljunisse.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2480,7 +2472,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2488,96 +2480,93 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid %"
-"ld, vananenuid %ld.\n"
+"%sLoetud %ld vana + %ld viidet, ühendatud %ld, kahtlaseid %ld, puuduvaid "
+"%ld, vananenuid %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " valmis.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2585,41 +2574,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2632,19 +2621,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2731,65 +2720,65 @@ msgstr "esimene mitmuse vormi indeks erineb nullist"
 msgid "plural form has wrong index"
 msgstr "mitmuse vorm omab vale indeksit"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "liiga palju vigu, katkestan töö"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "tundmatu võtmesõna: \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "vigane juhtjada"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "Ootamatu faili lõpp (fail lõppeb poole stringi pealt)"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
@@ -2879,28 +2868,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "liiga palju argumente"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "viga faili \"%s\" kirjutamisel"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2932,41 +2936,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standardväljund"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2976,13 +2980,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "tõlgitud teated peaksid mitte sisaldama `\\%c' erimärgijada"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2991,7 +2995,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3008,8 +3012,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3026,13 +3030,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3050,99 +3054,96 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3151,55 +3152,53 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: vigane võti -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3207,7 +3206,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3215,7 +3214,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3223,7 +3222,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3231,7 +3230,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3239,79 +3238,79 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse "
 "standardväljundisse"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on määramata"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3323,58 +3322,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3383,14 +3385,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3398,7 +3400,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3407,119 +3409,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3528,34 +3547,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3563,7 +3582,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
@@ -3572,6 +3591,13 @@ msgstr "tundmatu keel `%s'"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: lubamatu võti -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "väli `%s' sisaldab ikka veel algset väärtust"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "

diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index a740c87355f063ab1107f5be25fafd26ab72657f..073b64f0a826e3937e3363e92e089d71f68b1f6a 100644 (file)
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-08-31 11:36+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,22 +33,22 @@ msgstr "%s argumentu anbiguoa %s-rentzat"
 msgid "Valid arguments are:"
 msgstr "Argumentu erabilgarria:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ezin da aldiroko direktorioa aurkitu, saiatu $TMPDIR ezartzen"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ezin da \"%s\" txantiloia erabiliaz aldiroko direktorioa sortu"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ezin da aldiroko %s fitxategia ezabatu"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ezin da aldiroko %s direktorioa ezabatu"
@@ -56,44 +57,44 @@ msgstr "ezin da aldiroko %s direktorioa ezabatu"
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "errorea \"%s\" irakurri ondoren"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() -ek huts egin du"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Ez da C# konpiladorerik aurkitu, saiatu pnet instalatuaz"
@@ -103,74 +104,73 @@ msgstr "Ez da C# konpiladorerik aurkitu, saiatu pnet instalatuaz"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Sistema errore ezezaguna"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s azpirpozesuak huts egin du"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: legezkanpoko aukera -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: aukera baliogabea -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: -- %c aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -182,20 +182,20 @@ msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errorea \"%s\" fitxategia idazterakoan"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,20 +208,20 @@ msgstr ""
 "ez da java makina birtualik aurkitu, saiatu gcj instalatuaz edo $JAVAC "
 "ezarriaz"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -240,70 +240,69 @@ msgstr "ezin da tutua sortu"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ezin da \"%s\" irteera fitxategia sortu"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s azpiprozesua"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s azpiprozesua %d seinale konponezina jaso du"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr ""
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr "a formateatu - u in s t in"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u argumentuaren formatu espezifikazioa ez dago  '%s'-en"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "'msgid' eta '%s' formatu ezarpenak ez dira berdina %u argumentuarentzat"
 
@@ -335,9 +334,9 @@ msgstr ""
 "Kateak %u argumentuaz ari da baina %u argumentu zenbakia alde batetara uzten "
 "du."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'msgid' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -380,17 +379,17 @@ msgstr "KAtea direktiba erdian hasten da: '}' topatu da pareko '{'-rik gabe."
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "%u direktiban, bandera nahastea ez da zuzena."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -399,31 +398,31 @@ msgstr ""
 "%u zenbakidun direktiban, zehaztapenaren argumentu zenbakia %u-ren berdina "
 "izan behar da."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "%u zenbakidun direktiban, zehaztepen ezapena baliogabea da."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "%u zenbakidun direktiban, banderak ez dira onartzen '%c' ondoren."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
 
 #: src/format-invalid.h:22
@@ -534,19 +533,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "a formateatu - u in s t in"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "a formateatu - u t in s"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formateatu in eta s - u"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -560,11 +558,11 @@ msgstr "Handiagotu u u da - mota s a - mota s da."
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, fuzzy, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] "Handiagotu u u."
 msgstr[1] "Handiagotu u u."
 
@@ -614,12 +612,12 @@ msgstr "katea nori in."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "formateatu in eta s"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateatu in s a - in"
 
 #: src/format-perl.c:433
@@ -629,55 +627,52 @@ msgid ""
 "conversion specifier '%c'."
 msgstr "Handiagotu u tamaina da honekin k."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 #, fuzzy
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr "katea nori eta izengabe."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, fuzzy, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "katea nori s in."
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "a formateatu - s in s t in"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -718,11 +713,11 @@ msgid ""
 "1 and 9."
 msgstr "u da a eta."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -731,38 +726,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s-ek idatzia.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' erabili argibide gehiagorako.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Erabilera: %s [AUKERA]\n"
@@ -798,29 +793,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
@@ -829,11 +824,11 @@ msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 
@@ -842,30 +837,30 @@ msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "ezind a ostalari izena eskuratu"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -874,10 +869,10 @@ msgstr ""
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -885,23 +880,23 @@ msgstr ""
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
 "laburrentzat ere.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -909,32 +904,32 @@ msgstr ""
 "  -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak "
 "bilatzeko zerrendara\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
 "irakurriko da.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FITX      idatzi irteera ezarritako fitxategian\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -944,12 +939,12 @@ msgstr ""
 "bada\n"
 "edo berau - bada.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -957,7 +952,7 @@ msgstr ""
 "      --translated            mantendu itzulitakoak, ezabatu itzuli gabeko "
 "mezuak\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -965,55 +960,55 @@ msgstr ""
 "      --untranslated          mantendu itzuli gabekoak, ezabatu itzulitako "
 "mezuak\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantendu zalantza bezala markaturiko kateka\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantendu zaharkituriko #~ mezuak\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Atributu manipulazioa:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ezarri kate guztiak zalantza bezala\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           zalantza bandera kendu kate guztiei\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ezarri mezu guztiak zaharkituak bezala\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ezarri mezu guztiak ez-zaharkituk bezala\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1021,7 +1016,7 @@ msgid ""
 msgstr ""
 "      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1029,7 +1024,7 @@ msgstr ""
 "      --only-file=FITX.po     FITX.po fitxategian zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1037,13 +1032,13 @@ msgstr ""
 "      --ignore-file=FILE.po   FITX.po fitxategian ez zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy -ren sinonimo\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1051,16 +1046,16 @@ msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete -ren "
 "sinonimo\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1068,8 +1063,8 @@ msgstr ""
 "  -P, --properties-input      sarrera fitxategia Java .properties sintaxian "
 "dago\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1078,26 +1073,44 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings "
 "sintaxian dago\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ez erabili C ihesak irteeran (lehenetsia)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1105,97 +1118,97 @@ msgstr ""
 "  -E, --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              PO fitxategia idatzi nahiz hutsik egon\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                .po fitxategia koskadun estiloa erabiliaz "
 "idatzi\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1209,47 +1222,47 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
 "eskuratu\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1257,8 +1270,8 @@ msgstr ""
 "  -P, --properties-input      sarrera fixtategiak Java .properties sintasian "
 "daude\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1267,53 +1280,45 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategiak NeXTstep/GNUstep .strings\n"
 "                              sintaxian daude\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=IZENA         irteeraren kodeketa\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "zehazki 2 sarrera fitxategi behar dira"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Erabilera: %s [AUKERA] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1324,22 +1329,22 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      itzulpenak\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     iturburura erreferentziak\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operazio aldagaiak:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1347,59 +1352,64 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ref.pot ezarri def.po-ko domeinu bakoitzean\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             konutan izan zalantzan dauden sarrerak\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      kontutan izan itzuli gabeko mezuak\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "mezu hau itzuli gabe dago"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "mezu hau itzultzaile batek gainbegiratu behar du"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "mezu hau erabilia baina definitu gabe daago..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...baina definizio hau oso antzekoa da"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "mezu hau erabilia dago baina ez dago %s-en ezarria"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "oharra: mezu hau ez da erabiltzen"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "errorea konponezin %d aurkitu da"
 msgstr[1] "%d errorea konponezin aurkitu dira"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1412,48 +1422,48 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Itzulpen katalogo bat karaktere kodeketa ezberdin batera bihurtzen du.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Bihurtze helburua:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kokadun irteera estiloa\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           kendu '#: filename:line' lerroak\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1461,28 +1471,28 @@ msgstr ""
 "      --add-location          mantendu '#: filename:line' lerroak "
 "(lehenetsia)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "zehazki sarrera fitxategi bat behar da"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Erabilera: %s [AUKERA] SAR_FITXATEGIA\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1491,22 +1501,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   sarrera PO edo POT fitxategia\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "komando izena falta da"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] KOMANDOA [KOMANDO-AUKERA]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1516,67 +1526,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       sarrera PO fitxategia\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "huts irteera estandarrean idaztean"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "huts %s azpiprozesuan idaztean"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "iragazki izena falta da"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] IRAGAZKIA [IRAGAZKI-AUKERA]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "IRagazkia ezarri itzulpen guztiei edo itzulpen katalogo bati.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1584,124 +1594,106 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             ez erabili C ihesak irteeran (lehenespena)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           utzi goiburua eraldatu gabe, ez berau iragazi\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Oraindik ez da onartzen."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Huts %s azpiprozesua irakurtzerakoan"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s-ek \"-d directory\" ezarpen bat behar du"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s bakarrik %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s bakarrik %s, %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "itzulitako kate %d"
 msgstr[1] "%d itzulitako kate"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", zalantzan kate %d"
 msgstr[1] ", %d kate zalantzan"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", itzuli gabeko kate %d"
 msgstr[1] ", %d itzuli gabeko kate"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Testu itzulpen deskribapen batetik mezu katalogo bitar bat sortu.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1710,17 +1702,17 @@ msgstr ""
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
 "Antzekoa aukerako argumentuentzat.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1729,7 +1721,7 @@ msgstr ""
 "  -j, --java                  Java modua: Java ResourceBundle klase bat "
 "sortu\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1738,20 +1730,20 @@ msgstr ""
 "      --java2                 --java bezala ,  bain Java2 erabiliaz (JDK 1.2 "
 "edo altuagoa)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# modua: .NET .dll fitxategi bat sortu\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1759,33 +1751,33 @@ msgstr ""
 "      --tcl                   Tcl modua: tcl/msgcat .msg fitxategi bat "
 "sortu\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Irteera fitxategia - bada, irteera irteera estandarrean idatziko da.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Irteera fitxategi kokapena java moduan:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1794,7 +1786,7 @@ msgstr ""
 "  -l, --locale=LAKALA         lokal izena, edo hizkunzta edo "
 "hizkutza_NAZIOA\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1802,7 +1794,7 @@ msgstr ""
 "  -d DIRECTORY                klse direktorio ierarkiaren oinarri "
 "direktorioa\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1816,37 +1808,37 @@ msgstr ""
 "azpian\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Irteera fitxategi kokalekua C# moduan:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Irteera fitxategi kokapena Tcl moduan:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1856,12 +1848,12 @@ msgstr ""
 "direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1869,33 +1861,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1903,18 +1895,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             zalantzazko kateak erabili irteeran\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -1922,80 +1914,80 @@ msgstr ""
 "      --no-hash               fitxategi bitarrak ez du hash taula "
 "barneratuko\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "oharra: PO fitxategi burua nahasirik\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "oharra: msgfmt-ren bertsio zaharragoek errorea emango dute honetan\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "\"%s\" domeinu izena ez da fixtategi izen bezala erabili: aurrizki bat "
 "erabiliko da"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' direktiba alde batetara utziko da"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2004,14 +1996,14 @@ msgstr ""
 "'%c' aukera ezin da erabili 'J' , 'K' , 'T' , 'C' edo 'X' ezarria izan "
 "ondoren"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2051,7 +2043,7 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2059,17 +2051,17 @@ msgstr ""
 "      --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          fitxategi kokapenez ordenatu\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2079,7 +2071,7 @@ msgstr ""
 "ezarri LANG ingurune aldagaia, ABOUT-NLS fitxategian azaltzen\n"
 "den moduan.  HAu beharrezkoa da itzulpenak probatu ahal izateko.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2090,12 +2082,12 @@ msgstr ""
 "Mesedez ezarri locale-a --locale aukeraren bidez edo irteera\n"
 ".po fitxategia --output-file fitxategiaren bidez.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s-ek sortua .\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2104,12 +2096,12 @@ msgstr ""
 "PO fitxategi berri bat sortu, meta informazioa erabiltzailearen inguruneko balioez\n"
 "abiarazten.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SAR_FITXATEGIA       sarrera POT fitxategia\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2120,26 +2112,26 @@ msgstr ""
 "fitxategiaren bila.\n"
 "berau - bada, sarrera estandarra irakurriko da\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FITXATEGIA      idatzi irteera ezarritako PO "
 "fitxategian\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          helburu locale-a ezarri\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2147,7 +2139,7 @@ msgstr ""
 "      --no-translator         PO fitxategia automatikoki sortu dela "
 "pentsatu\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2155,12 +2147,12 @@ msgstr ""
 ".pot fitxategi bat baino gehiago topatu da.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "errorea uneko direkotrioa irakurtzerakoan"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2168,14 +2160,14 @@ msgstr ""
 "Ez da uneko direkotrioan .pot fitxategirik aurkitu.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s azpiprozesuak %d irteera kodeaz huts egin du"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2192,47 +2184,47 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "dagoen \"%s\" karaktere jokoa ez da kodeketa izen portable bat"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "bi karaktere joko ezberdin \"%s\" eta \"%s\" sarrera fitxategian"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "`%s' sarrera fitxategiak ez du karaktere joko ezarpena duen goibururik"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, fuzzy, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "s in s t a goiburua honekin a"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "s da a."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2242,7 +2234,7 @@ msgstr ""
 "artean.\n"
 "Irteera UTF-8 -ra bihurtzen.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2255,7 +2247,7 @@ msgstr ""
 "Irteera UTF-8 -ra bihurtzen.\n"
 "BEste irteera kodeketa bat hautatzeko, --to-code aukera erabili.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2264,7 +2256,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2277,12 +2269,12 @@ msgstr ""
 "'%s'-ren irteera okerra izan.\n"
 "Aukera posibleak:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL %s kodeketa duen lokal batetara ezarri.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2293,7 +2285,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero %s 'msgconv' erabiliaz atzera bihurtu.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2306,7 +2298,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero 'msgconv' erabiliaz %s-ra atzera bihurtu.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2317,26 +2309,26 @@ msgstr ""
 "'%s'-ren irteera okerra izan daiteke.\n"
 "Aukera bat LC_ALL=C ezartzea da.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "espresio pluralek balio negatiboak sortu ditzakete"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu baina plural espresioek %lu baino balio handiagoak sortu "
 "ditzakete"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "espresio pluralek 0-z zatiketak srotu ditzakete"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "espresio pluralek zenbaki oso gainezkatze bat sortu dezakete"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2344,51 +2336,51 @@ msgstr ""
 "espresio pluralek salbuespen aritmetikoak sortu ditzakete, posibleki 0-z "
 "zatiketak"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "baina zenbait mezuk bakarrik forma plural bat dute"
 msgstr[1] "baina zenbait mezuk bakarrik %lu forma plural dituzte"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "baina zenbait mezuk forma plural bat dute"
 msgstr[1] "baina zenbait mezuk %lu forma plural dituzte"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2396,82 +2388,82 @@ msgstr ""
 "mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela amaitzen: '\\n''"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "`%s' goiburu eremua falta da goiburuan\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: errorea \"%s\" kodeketatik \"%s\" kodeketara bihurketa egitean"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2480,15 +2472,15 @@ msgstr ""
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago, eta iconv() -ek ez du bihurketa hau onartzen."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2497,16 +2489,16 @@ msgstr ""
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago. Bertsio hau iconv() gabe erabili zen."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s %s-rekin bakarrik da baliozkoa"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "babeskopia mota"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2520,24 +2512,24 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2547,27 +2539,27 @@ msgstr ""
 "                              ez egin ezer def.po dagoeneko eguneraturik "
 "badago\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Emaiztak berriz def.po fitxategian idatziko dira.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po-ren babeskopia bat egin\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AURRIZKI      gainidatzi babeskopia aurrizki arrunta\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2579,7 +2571,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2587,60 +2579,57 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       kendu aurrerapen erakusleak\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "mezu honek plural moduak ezarri behar ditu"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "uneko"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " eginda.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s eta fitxategi izen zehatzak batak bestea oztopatzen dute"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Bihurtu mezu katalogo bitarra Uniforum rdtiloko .po fitxategi.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2649,20 +2638,20 @@ msgstr ""
 "  -j, --java                  Java modua: sarrera Java ResourceBundle klase "
 "bat da\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# modua: sarrera .NET .dll fitxategi bat da\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2670,17 +2659,17 @@ msgstr ""
 "      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
 "bat da\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FITXATEGIA...               sarrera .mo fixtaegiak\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Sarrera fitxategi kokapena Java moduan:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2688,41 +2677,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Sarrera fitxategi kokapen C# moduan\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Sarrera fitxategi kokalekua Tcl moduan\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                idatzi koskadun estiloko irteera\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2735,13 +2724,13 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 "  -d, --repeated              errepikaturiko mezuak bakarrik inprimatu\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2750,7 +2739,7 @@ msgstr ""
 "  -u, --unique                mezu bakarrak bakarrik inprimatu, "
 "bikoiztutakoak alboratu\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<irteera-estandarra>"
@@ -2837,65 +2826,65 @@ msgstr "lehen plural moduak zero ez den indize bat du"
 msgid "plural form has wrong index"
 msgstr "plural moduak okerreko indize bat du"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "errore gehiegi, uzten"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "multibyte sekuentzia baliogabea"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "byte-anitzeko sekuentzia amaitugabea fitxategi amaieran"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "byte-anitzeko sekuentzia amaitugabea lerro amaieran"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv hutsa"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "\"%s\" hitz-gakoa ezezaguna da"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "kontrol sekuentzia baliogabea"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "fitxategi-amaiera katerik gabe"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "lerro-amaiera katerik gabe"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "bikoizturiko mezu definizioa"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "hau da lehen definizioaren kokalekua"
 
@@ -2980,17 +2969,17 @@ msgstr "sarrera ez da baliozkoa \"%s\" kodeketan"
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "errorea \"%s\" kodeketatik  \"%s\" kodeketara formatua bihurtzean"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "bi argumentu espero ziren"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Erabilera: %s [AUKERA] URL FITXATEGIA\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -2999,11 +2988,26 @@ msgstr ""
 "URL batetako edukiak eskuratu eta atera.  URL-a ezin bada ebatzi,\n"
 "lokalki eskuragarri dagoen FITXATEGIA erabiliko da.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "errorea irteera estandarrean idazterakoan"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 #, fuzzy
 msgid ""
@@ -3041,43 +3045,43 @@ msgstr ""
 "mezu katalogoak itzulpen pluralak ditu, baina irteera formatuak ez ditu "
 "onartzen."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "irteera estandarra"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Huts \"%s\" direktorioa sortzerakoan"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
 "$JAVAC ezarriz"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3089,13 +3093,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3109,7 +3113,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3134,8 +3138,8 @@ msgstr ""
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr "karakterera Qt formateatu Unicode in in n"
@@ -3153,14 +3157,14 @@ msgstr "karakterera Qt formateatu Unicode in in n"
 msgid "error while writing to %s subprocess"
 msgstr "errorea %s azpirpozesuan idazterakoan"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "C formateatu t n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3181,99 +3185,97 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, fuzzy, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr "ASCII katea s s Nork n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l osatu gabea Nork n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "s l katea"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3282,56 +3284,55 @@ msgstr ""
 "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
 "Bertsio hau expta gabe eraiki da.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "s l katea"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: ez da kate amaiera aurkitzen \"%s\" fixtategi amaiera aurreko inon"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: eskuin giltza falta da hemen:  \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\l\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\u\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: aldagai interpolazio baliogabe a \"%c\"-en"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\L\") 8bit-eko karakterean\"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\U\") 8bit-eko karakterean\"%c\""
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "ASCII katea s s Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3339,7 +3340,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3347,7 +3348,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l osatu gabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3355,7 +3356,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3363,7 +3364,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3371,27 +3372,27 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: kate definizio baliogabea"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: zenbaki bat faltda da # ondoren"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: kate espresio baliogabea"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3400,28 +3401,28 @@ msgstr ""
 "%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
 "arrazoiegatik ; eval_gettext erabili horren ordez"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "oharra: `%s' fitxategi hedaopena `%s' ezezaguna da, C probatuko da"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3430,12 +3431,12 @@ msgstr ""
 "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
 "ordez)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3443,12 +3444,12 @@ msgstr ""
 "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
 "dira\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3467,12 +3468,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3481,7 +3482,7 @@ msgstr ""
 "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
 "da.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3490,41 +3491,44 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Lehenespen modura sarrera fitxategiak ASCII direla suposatuko da.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FITXATEGIA.po  FITXATEGIA.po fitxategiko kateak ez dira "
 "irauliko\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3538,14 +3542,14 @@ msgstr ""
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3553,7 +3557,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3567,38 +3571,38 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C trigraphs-ak ulertu sarreran\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3606,17 +3610,17 @@ msgstr ""
 "      --debug                 kate formatu atzemateari buruzko informazio "
 "hedatuagoa\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3624,17 +3628,17 @@ msgstr ""
 "      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
 "erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3642,56 +3646,73 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
 "helbidea ezarri\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "--flag argumentuak ez du <hitz-ako>:<argzenb>:[pasa-]<badera> sintasia: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: oharra: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3700,7 +3721,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3710,28 +3731,28 @@ msgstr ""
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3743,7 +3764,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
@@ -3752,6 +3773,27 @@ msgstr "`%s' hizkuntza ezezaguna"
 msgid "<unnamed>"
 msgstr "<izengabea>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: legezkanpoko aukera -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Oraindik ez da onartzen."
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Huts %s azpiprozesua irakurtzerakoan"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+
 #, fuzzy
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Anizkoitza nori k."

diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index f9ba4892b46c29a3c79eb934d5b3f41836f179f5..19aa1c729cfbfcaf0b743a57e824c03a9006f599 100644 (file)
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-06-06 20:36+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -35,22 +35,22 @@ msgstr "moniselitteinen argumentti %s %s:lle"
 msgid "Valid arguments are:"
 msgstr "Kelvolliset argumentit ovat:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei voi luoda putkea"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "väliaikaistiedostoa %s ei voi poistaa"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -59,10 +59,10 @@ msgstr ""
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
@@ -88,8 +88,8 @@ msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 msgid "error after reading \"%s\""
 msgstr "virhe tiedoston ”%s” lukemisen jälkeen"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,74 +106,73 @@ msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: valitsin ”%s” on moniselitteinen\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, 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:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tuntematon valitsin ”--%s”\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: virheellinen valitsin – %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: virheellinen valitsin – %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: valitsin vaatii argumentin – %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,14 +184,14 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, fuzzy, c-format
 msgid "error while writing \"%s\" file"
@@ -208,8 +207,8 @@ msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta $JAVAC"
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, fuzzy, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s aliprosessi"
@@ -221,8 +220,8 @@ msgstr "%s aliprosessi"
 msgid "memory exhausted"
 msgstr "muisti loppu"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "ei voi luoda putkea"
@@ -282,7 +281,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -291,7 +290,7 @@ msgstr "muotomäärittelyä argumentille %u ei ole olemassa 'msgid':lle '%s':ss
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -299,7 +298,7 @@ msgstr "muotomäärittely argumentille %u ei ole '%s':ssä"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -684,11 +683,11 @@ msgid ""
 msgstr ""
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -701,38 +700,38 @@ msgstr ""
 "Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Komento ”%s --help” antaa lisää tietoja.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN]\n"
@@ -770,29 +769,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  näytä tämä ohje ja poistu\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
@@ -801,11 +800,11 @@ msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
@@ -817,321 +816,339 @@ msgstr ""
 msgid "could not get host name"
 msgstr "ei saatu isäntänimeä"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             aseta kaikki viestit vajaiksi\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           aseta kaikki viestit epävajaiksi\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syötetiedoston syntaksi:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]...\n"
@@ -1150,23 +1167,23 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jos syötetiedosto on -, luetaan vakiosyötettä.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1180,76 +1197,62 @@ msgid ""
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "syötetiedostoja ei annettu"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tarvitaan täsmälleen kaksi syötetiedostoa"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Käyttö: %s [VALITSIN] tiedosto.po referenssi.pot\n"
@@ -1275,19 +1278,19 @@ msgstr ""
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1312,17 +1315,17 @@ msgstr "tämä viesti on kääntämättä"
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
@@ -1339,12 +1342,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "%d vakava virhe"
 msgstr[1] "%d vakavaa virhettä"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "on annettava vähintään kaksi tiedostoa"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1357,74 +1360,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tarvitaan täsmälleen yksi syötetiedosto"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1433,7 +1436,7 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1467,7 +1470,7 @@ msgstr ""
 "Erityinen sisäinen komento nimeltä ”0” tulostaa käännöksen ja nollatavun.\n"
 "”msgexec 0”:n tuloste kelpaa syötteeksi ”xargs -0”:lle.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=SYÖTETIED       syöte-PO-tiedosto\n"
@@ -1482,27 +1485,27 @@ msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 msgid "write to %s subprocess failed"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "ei riittävästi argumentteja"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, fuzzy, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Soveltaa suodatinta kaikkiin käännösluettelon käännöksiin.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1512,18 +1515,18 @@ msgstr ""
 "vakiosyötteestä\n"
 "ja kirjoittaa muutetun käännöksen vakiotulosteeseen.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1531,24 +1534,24 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1565,22 +1568,22 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, fuzzy, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "virheellinen argumentti ”%s” ”%s”:lle"
@@ -1630,7 +1633,7 @@ msgstr ""
 "Luo binäärimuotoisia viestiluetteloita tekstimuotoisesta "
 "käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1644,7 +1647,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
@@ -1691,7 +1694,7 @@ msgstr "      --qt                    Qt-tila: luo Qt:n .qm-tiedosto\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
@@ -1701,13 +1704,13 @@ msgstr "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1735,7 +1738,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1754,7 +1757,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1766,7 +1769,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
@@ -1835,7 +1838,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -1890,7 +1893,7 @@ msgstr "vajaa ”msgstr”-merkintä jätetty huomioimatta"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -1901,21 +1904,21 @@ msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1955,30 +1958,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1986,24 +1989,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2011,54 +2014,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s aliprosessi epäonnistui"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2070,7 +2073,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Suomenkielinen käännös %s-paketille"
@@ -2105,7 +2108,7 @@ msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
@@ -2325,7 +2328,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "syötetiedosto ei sisällä merkistön määrittelevää otsakeriviä"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2340,23 +2343,23 @@ msgid ""
 msgstr ""
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2370,51 +2373,51 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2426,7 +2429,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2434,92 +2437,92 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " valmis.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Muunna binäärimuotoinen viestiluettelo Uniforum-tyyliseksi .po-tiedostoksi.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2527,41 +2530,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2574,12 +2577,12 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2713,7 +2716,7 @@ msgstr "rivinvaihto merkkijonon sisällä"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
@@ -2882,32 +2885,32 @@ msgstr "ei voi luoda putkea"
 msgid "standard output"
 msgstr "vakiotuloste"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "C#-luokan kääntäminen epäonnistui"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3011,7 +3014,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3097,32 +3100,32 @@ msgstr ""
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: virheellinen valitsin – %c\n"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
@@ -3200,50 +3203,50 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3255,41 +3258,41 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3299,17 +3302,17 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3318,14 +3321,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3333,7 +3336,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3342,75 +3345,75 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3418,7 +3421,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3426,52 +3429,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varoitus: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3480,34 +3483,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3515,7 +3518,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "kieli ”%s” on tuntematon"
@@ -3524,6 +3527,9 @@ msgstr "kieli ”%s” on tuntematon"
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: virheellinen valitsin – %c\n"
+
 #, fuzzy
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "%s aliprosessi epäonnistui"

diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index d24a13f1c02a749e817f24b1d62f3ac65b22b2b0..8bf64111f9d038311e262c141db344676123d9a2 100644 (file)
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-27 13:35+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,25 +35,25 @@ msgstr "Argument ambigu %s pour %s"
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont :"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "Impossible de trouver un répertoire temporaire. Essayez de définir la "
 "variable $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "Impossible de créer un répertoire temporaire en utilisant le modèle « %s »"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Impossible de supprimer le fichier temporaire « %s »"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Impossible de supprimer le dossier temporaire « %s »"
@@ -61,44 +62,44 @@ msgstr "Impossible de supprimer le dossier temporaire « %s »"
 msgid "write error"
 msgstr "Erreur d'écriture"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "Erreur d'ouverture du fichier d'archive « %s » en écriture"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "Erreur de lecture de « %s »"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "Erreur d'écriture de « %s »"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "Erreur après la lecture de « %s »"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "Échec de la fonction « fdopen() »"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Le compilateur C# est introuvable. Essayez d'installer « pnet »"
@@ -108,74 +109,73 @@ msgstr "Le compilateur C# est introuvable. Essayez d'installer « pnet »"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "La machine virtuelle C# est introuvable. Essayez d'installer « pnet »"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Échec du sous-processus %s"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s : l'option « %s » requiert un argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s : l'option « --%c » n'est pas permise\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : l'option « --%c » n'est pas valide\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option « --%c » exige un argument\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s : l'option « %s » requiert un argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -187,20 +187,20 @@ msgstr "argument source_version invalide pour compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argument target_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Échec lors de la création de « %s »"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Erreur pendant l'écriture du fichier « %s »"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -214,20 +214,20 @@ msgstr ""
 "La machine virtuelle Java est introuvable. Essayez d'installer « gij » ou de "
 "définir la variable d'environnement $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Erreur d'E/S du sous-processus %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -246,74 +246,73 @@ msgstr "Création du tube impossible"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "Échec de la fonction « DuplicateHandle » avec le code d'erreur 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Échec de la fonction « _open_osfhandle »"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "Impossible de créer le fichier « %s »"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "sous-processus %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Le sous-processus %s a reçu le signal fatal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "« %s » n'est pas une chaîne de format %s valide, contrairement à « msgid ». "
 "Raison : %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
-"Le format de l'argument «·%u·» dans la chaîne « msgid » n'a pas été spécifié, "
-"comme dans « %s »."
+"Le format de l'argument «·%u·» dans la chaîne « msgid » n'a pas été "
+"spécifié, comme dans « %s »."
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "Le format de l'argument « %u » n'a pas été spécifié dans « %s »"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "Les spécifications de format entre « msgid » et « %s » de l'argument %u ne "
 "sont pas identiques"
@@ -347,12 +346,12 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "La chaîne fait appel à l'argument numéro %u mais ignore l'argument numéro %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
-"Il n'y a pas le même nombre de spécifications de format entre « msgid » et « %"
-"s »."
+"Il n'y a pas le même nombre de spécifications de format entre « msgid » et "
+"« %s »."
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -379,8 +378,8 @@ msgstr ""
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"La directive numéro %u se termine par le caractère invalide « %c » au lieu de "
-"« } »."
+"La directive numéro %u se termine par le caractère invalide « %c » au lieu "
+"de « } »."
 
 #: src/format-csharp.c:140
 #, c-format
@@ -402,18 +401,18 @@ msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 "La chaîne contient un caractère « } » solitaire après la directive numéro %u"
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "Dans la directive numéro %u, la combinaison des  est invalide"
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "Dans la directive numéro %u, une précision n'est pas permise avant « %c »."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -422,7 +421,7 @@ msgstr ""
 "Dans la directive numéro %u, le nombre d'arguments pour la précision doit "
 "être égal à %u"
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -431,25 +430,25 @@ msgstr ""
 "Dans la directive numéro %u, une indication de précision n'est pas permise "
 "avant « %c »."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "Dans la directive numéro %u, l'indication de précision est incorrecte."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 "Dans la directive numéro %u, les drapeaux ne sont pas permis avant « %c »."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' utilise %%m mais '%s' ne l'utilise pas"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' n'utilise pas %%m mais '%s' utilise %%m"
 
 #: src/format-invalid.h:22
@@ -561,23 +560,22 @@ msgstr ""
 "suivi par « < », « # » ou « %s »."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "Une spécification de format pour l'argument {%u} dans la chaîne « msgid » "
 "n'est pas spécifié, comme dans « %s »."
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "Le format de l'argument {%u} dans la chaîne « %s » n'est pas spécifié."
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "Les spécifications de format dans la chaîne « msgid » et dans « %s ».ne sont "
 "pas les mêmes pour l'argument {%u}."
@@ -595,11 +593,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "Dans la directive numéro %u, trop de paramètres sont fournis (il en faut %u "
 "au maximum)."
@@ -647,22 +645,23 @@ msgstr ""
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "Dans la directive numéro %u, « ~; » est utilisé à une place incorrecte."
+msgstr ""
+"Dans la directive numéro %u, « ~; » est utilisé à une place incorrecte."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr "La chaîne fait référence à un argument de manière incompatible."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 "Les spécifications de format dans la chaîne « msgid » et dans « %s » ne sont "
 "pas équivalentes"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "Les spécifications de format dans « %s » ne sont pas un sous-ensemble de "
 "celles de la chaîne « msgid »."
@@ -676,12 +675,12 @@ msgstr ""
 "Dans la directive numéro %u, l'indicateur de taille est incompatible avec "
 "l'indicateur de conversion « %c »."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "Le format de l'argument « %s » dans « %s » n'est pas spécifié."
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -689,54 +688,52 @@ msgstr ""
 "La chaîne fait référence à des arguments de deux façons différentes : avec "
 "des noms d'arguments et avec des spécifications d'arguments sans nom."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "La chaîne fait référence à l'argument « %s » de manière incompatible."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "Les spécifications de format de « msgid » requièrent une carte de "
 "correspondance, celles de « %s » requièrent un n-uplet."
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "Les spécifications de format de « msgid » requièrent un n-uplet (tuple), "
 "celles de « %s » requièrent une carte de correspondance (mapping)."
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "Le format de l'argument « %s » dans la chaîne « msgid » n'est pas spécifié, "
 "comme dans « %s »."
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "Les spécifications de format dans la chaîne « msgid » et « %s » pour "
 "l'argument « %s » ne sont pas les mêmes."
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
-"La chaîne « msgid » est une chaîne de format simple, mais « %s » n'en est pas "
-"une : elle contient un drapeau « L » ou un nombre d'arguments à deux chiffres"
+"La chaîne « msgid » est une chaîne de format simple, mais « %s » n'en est "
+"pas une : elle contient un drapeau « L » ou un nombre d'arguments à deux "
+"chiffres"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -771,8 +768,8 @@ msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
 msgstr ""
-"Dans la directive numéro %u, le caractère « %c » n'est pas un chiffre compris "
-"entre 1 et 9."
+"Dans la directive numéro %u, le caractère « %c » n'est pas un chiffre "
+"compris entre 1 et 9."
 
 #: src/format-ycp.c:91
 #, c-format
@@ -783,11 +780,11 @@ msgstr ""
 "Le caractère qui termine la directive numéro %u n'est pas un chiffre compris "
 "entre 1 et 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -800,38 +797,38 @@ msgstr ""
 "Ceci est un logiciel libre : vous pouvez le modifier et le redistribuer.\n"
 "Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "Trop d'arguments"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage : %s [OPTION]\n"
@@ -867,29 +864,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresses IP du nom de machine\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afficher ce message d'aide, puis terminer\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afficher le numéro de version de ce programme, puis terminer\n"
@@ -898,11 +895,11 @@ msgstr "  -V, --version               afficher le numéro de version de ce progr
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
@@ -911,30 +908,30 @@ msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "Impossible d'obtenir le nom de machine"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -943,10 +940,10 @@ msgstr ""
 "msgattrib permet de filtrer les messages d'un catalogue de traduction selon leurs attributs\n"
 "et de manipuler les attributs.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -955,23 +952,23 @@ msgstr ""
 "également\n"
 "obligatoires pour les formes courtes correspondantes.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHIER ...                 fichier PO d'entrée\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -979,32 +976,32 @@ msgstr ""
 "  -D, --directory=DOSSIER     ajouter le DOSSIER pour la recherche des "
 "fichiers d'entrée\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "  Si le nom du fichier d'entrée est « - » ou s'il n'est pas fourni, les "
 "données sont lues depuis l'entrée standard.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1013,12 +1010,12 @@ msgstr ""
 "  Si aucun fichier n'est spécifié ou si le nom de fichier est « - »,\n"
 "  les résultats sont envoyés vers la sortie standard.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Sélection des messages :\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1026,7 +1023,7 @@ msgstr ""
 "      --translated            conserver les messages traduit, retirer les "
 "messages non traduits\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1034,60 +1031,61 @@ msgstr ""
 "      --untranslated          conserver les messages non traduits, retirer "
 "les messages traduits\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            conserver seulement les messages marqués "
 "« fuzzy »\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           retirer les messages obsolètes « #~ »\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         conserver seulement les messages obsolètes "
 "« #~ »\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulation d'attribut :\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
-"      --set-fuzzy             placer tous les messages dans l'état « fuzzy »\n"
+"      --set-fuzzy             placer tous les messages dans l'état "
+"« fuzzy »\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marquer tous les messages comme obsolètes\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1096,7 +1094,7 @@ msgstr ""
 "      --clear-previous        retirer la chaîne « previous msgid » de tous "
 "les messages\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1104,7 +1102,7 @@ msgstr ""
 "      --only-file=FICHIER.po  manipuler seulement les entrées listées dans "
 "le FICHIER.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1112,13 +1110,13 @@ msgstr ""
 "      --ignore-file=FICHIER.po  manipuler seulement les entrées qui ne sont "
 "pas listées dans le FICHIER.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 identique à « --only-fuzzy --clear-fuzzy »\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1126,16 +1124,16 @@ msgstr ""
 "      --obsolete              identique à « --only-obsolete --clear-"
 "obsolete »\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntaxe du fichier d'entrée :\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1143,8 +1141,8 @@ msgstr ""
 "  -P, --properties-input      la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1153,17 +1151,43 @@ msgstr ""
 "      --stringtable-input     la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 toujours utiliser de la couleur et d'autres "
+"attributs de texte\n"
+"      --color=QUAND            utiliser de la couleur et des attributs de "
+"texte seulement QUAND.\n"
+"                              QUAND peut être « always », « never », « auto "
+"», or « html ».\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
+"pour --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1171,9 +1195,9 @@ msgstr ""
 "  -e, --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1181,31 +1205,31 @@ msgstr ""
 "  -E, --escape                utiliser des séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              créer un fichier .po même s'il est vide\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                créer le fichier .po avec un style indenté\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           ne pas créer les commentaires de numérotation "
 "du type « #: fichier:ligne»\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1213,8 +1237,8 @@ msgstr ""
 "  -n, --add-location          créer des commentaires de numérotation du type "
 "« #: fichier:ligne » (par défaut)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1222,17 +1246,17 @@ msgstr ""
 "      --strict                créer des fichier .po strictement conformes à "
 "l'Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     créer un fichier « .properties » de type Java\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1240,16 +1264,16 @@ msgstr ""
 "      --stringtable-output    créer un fichier « .strings » de type NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NOMBRE          spécifier la largeur de page\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1259,33 +1283,33 @@ msgstr ""
 "plus longues\n"
 "                              que la largeur des pages de sortie.\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          trier les données de sortie selon "
 "l'emplacement des fichiers\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Critère de sélection irréalisable (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1307,27 +1331,27 @@ msgstr ""
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 "Les indications de position de tous les fichiers .po seront accumulées.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHIER    obtenir la liste des fichiers d'entrée à "
 "partir du FICHIER\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 "  Si le nom du fichier d'entrée est « - », les données sont lues depuis "
 "l'entrée standard.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1336,7 +1360,7 @@ msgstr ""
 "  -<, --less-than=N           afficher les messages définis moins de N fois\n"
 "                              (sans limite par défaut)\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1345,7 +1369,7 @@ msgstr ""
 "  ->, --more-than=N           afficher les messages définis plus de N fois\n"
 "                              (zéro par défaut, càd sans limite)\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1354,8 +1378,8 @@ msgstr ""
 "  -u, --unique                Afficher les messages uniques (identique à « --"
 "less-than=2 »)\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1363,8 +1387,8 @@ msgstr ""
 "  -P, --properties-input      la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1373,12 +1397,12 @@ msgstr ""
 "      --stringtable-input     la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ENCODAGE      encodage de sortie\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1389,49 +1413,33 @@ msgstr ""
 "                              message ; ne pas faire la fusion de plusieurs "
 "traductions\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --color                 toujours utiliser de la couleur et d'autres "
-"attributs de texte\n"
-"      --color=QUAND            utiliser de la couleur et des attributs de "
-"texte seulement QUAND.\n"
-"                              QUAND peut être « always », « never », « auto », "
-"or « html ».\n"
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
-"pour --color\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "Fichiers d'entrée non spécifiés"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Deux fichiers sont requis en entrée"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage : %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1450,22 +1458,22 @@ msgstr ""
 "de votre programme.  Lorsqu'une correspondance exacte n'est pas possible,\n"
 "une correspondance floue est utilisé pour un meilleur diagnostic.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traductions\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     références aux sources\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificateurs d'opération:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1474,61 +1482,67 @@ msgstr ""
 "  -m, --multi-domain          appliquer ref.pot à chaque domaine défini dans "
 "def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+"  -N, --no-fuzzy-matching     ne pas utiliser la correspondance floue\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "      --use-fuzzy             utiliser les traductions approximatives "
 "(fuzzy)\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      utiliser les messages non traduits\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "ce message n'est pas traduit"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "ce message doit être révisé par le traducteur"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "Ce message est utilisé mais non défini..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais cette définition est semblable"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "Ce message est utilisé mais non défini dans « %s »"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d erreur fatale trouvée"
 msgstr[1] "%d erreurs fatales trouvées"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Il faut indiquer au moins deux fichiers"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1548,7 +1562,7 @@ msgstr ""
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 "Les commentaires de position de tous les fichiers .po seront accumulés.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1558,7 +1572,7 @@ msgstr ""
 "N\n"
 "                              définitions (1 par défaut)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1566,70 +1580,70 @@ msgstr ""
 "      --omit-header           ne pas créer d'en-têtes de la forme « msgid "
 "\"\" »' \n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "msgconv permet de modifier l'encodage utilisé dans un catalogue de "
 "traduction.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cible de conversion :\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indenter les données de sortie\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           supprimer les commentaires du type « #: fichier:"
-"ligne »\n"
+"      --no-location           supprimer les commentaires du type « #: "
+"fichier:ligne »\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"      --add-location          conserver les commentaires du type « #: fichier:"
-"ligne » (par défaut)\n"
+"      --add-location          conserver les commentaires du type « #: "
+"fichier:ligne » (par défaut)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                créer une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "Un (et un seul) fichier d'entrée doit être fourni"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage : %s [OPTION] FICHIER_ENTRÉE\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1643,22 +1657,22 @@ msgstr ""
 "Le texte original anglais du champ « msgid » est alors utilisé\n"
 "comme traduction pour les messages non traduits.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .po ou .pot\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "Il manque le nom de la commande"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Usage : %s [OPTION] COMMANDE [OPTION_DE_COMMANDE]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1673,7 +1687,7 @@ msgstr ""
 "la sortie de msgexec.  msgexec renvoie un code qui correspond au maximum du code de\n"
 "retour pour toutes les invocations.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1682,44 +1696,44 @@ msgstr ""
 "Une commande interne spéciale appelée « 0 » renvoie la traduction suivie par un\n"
 "octet nul.  La sortie de « msgexec 0 » peut être utilisée comme entrée pour « xargs -0 ».\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHIER         fichier .po d'entrée\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "Échec d'écriture sur la sortie standard"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Échec d'écriture sur le sous-processus %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "Il manque le nom du filtre"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "Un script « sed » doit au moins être spécifié"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage : %s [OPTION] FILTRE [OPTION_DU_FILTRE]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "msgfilter permet d'appliquer un filtre à toutes les traductions d'un "
 "catalogue.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1729,19 +1743,19 @@ msgstr ""
 "l'entrée standard et qui renvoie une traduction modifiée sur la sortie "
 "standard.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Options de filtrage utiles lorsque le FILTRE est « sed » :\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à exécuter\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1751,7 +1765,7 @@ msgstr ""
 "  -f, --file=FICHIER_SCRIPT   ajouter le contenu du FICHIER_SCRIPT aux "
 "commandes à exécuter\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1759,7 +1773,7 @@ msgstr ""
 "  -n, --quiet, --silent       demander à « sed »  de ne pas afficher son "
 "espace de travail (pattern space)\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1767,114 +1781,94 @@ msgstr ""
 "      --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indenter la sortie\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           ne pas filtrer ni modifier l'en-tête\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Pas encore implanté"
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"Impossible d'établir des entrées/sorties non bloquantes pour le sous-"
-"processus %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "Échec de communication avec le sous-processus %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Échec de lecture depuis le sous-processus %s"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "Sous-processus %s terminé avec le code de sortie %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "L'argument de %s devrait être un simple caractère de ponctuation"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ordre des octets invalide (endianness) : %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s a besoin de l'option « -d DOSSIER »"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s a besoin de l'option « -l locale »"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s n'est valide qu'avec %s ou %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s n'est valide qu'avec %s, %s ou %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d message traduit"
 msgstr[1] "%d messages traduits"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduction approximative"
 msgstr[1] ", %d traductions approximatives"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d message non traduit"
 msgstr[1] ", %d messages non traduits"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage : %s [OPTION] fichier.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "msgfmt permet de créer un catalogue binaire de messages à partir de la "
 "description textuelle des traductions.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1883,17 +1877,17 @@ msgstr ""
 "Les arguments obligatoires pour les formes longues des options sont également\n"
 "obligatoires pour les formes courtes correspondantes. (idem options factultatives)\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1902,7 +1896,7 @@ msgstr ""
 "  -j, --java                  mode JAVA : produire une classe Java "
 "« ResourceBundle »\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1911,63 +1905,63 @@ msgstr ""
 "      --java2                 identique à --java, mais pour Java2 (JDK 1.2 "
 "ou plus récent)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                mode C# : générer un fichier « .dll » de type ."
 "NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      mode C# : produire un fichier « .resources » de "
-"type .NET\n"
+"      --csharp-resources      mode C# : produire un fichier « .resources » "
+"de type .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   mode TCL : produire un fichier « .msg » de type "
-"tcl/msgcat\n"
+"      --tcl                   mode TCL : produire un fichier « .msg » de "
+"type tcl/msgcat\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --tcl                   mode QT : produire un fichier « .qm » de type "
 "Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                active le mode de conformité stricte à "
 "l'Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "  Si le nom du fichier de sortie est « - », la sortie est envoyée vers la "
 "sortie standard\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Java :\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    nom de la ressource\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1976,7 +1970,7 @@ msgstr ""
 "  -l, --locale=LOCALE         nom de la « locale » (par exemple « fr » ou "
 "« fr_FR »)\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1984,7 +1978,7 @@ msgstr ""
 "  -d DOSSIER                  répertoire de base de la hiérarchie des "
 "classes\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1998,12 +1992,12 @@ msgstr ""
 "obligatoire. La classe est créée\n"
 "  dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Emplacement du fichier de sortie en mode C# :\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2012,7 +2006,7 @@ msgstr ""
 "  -d DOSSIER                  répertoire de base pour les fichiers .dll "
 "dépendants de la « locale »\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2022,19 +2016,19 @@ msgstr ""
 "  Le fichier .dll est créé dans le sous-répertoire (du répertoire spécifié)\n"
 "  dont le nom dépend de la « locale ».\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DOSSIER                  répertoire de base des catalogues de messages "
 "de type « .msg »\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2043,12 +2037,12 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2060,14 +2054,14 @@ msgstr ""
 "                              --check-format, --check-header et --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          vérifier les chaînes de formatage dépendantes "
 "du langage\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2076,7 +2070,7 @@ msgstr ""
 "      --check-header          vérifier la présence et le contenu de l'en-"
 "tête\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2086,7 +2080,7 @@ msgstr ""
 "domaine\n"
 "                              et l'option « --output-file »\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2095,7 +2089,7 @@ msgstr ""
 "  -C, --check-compatibility   vérifier que le « msgfmt » de GNU se comporte "
 "comme celui de X/Open\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2106,14 +2100,14 @@ msgstr ""
 "clavier\n"
 "                                   pour les éléments de menu\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliser les traductions approximatives "
 "(fuzzy) dans la sortie\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2121,7 +2115,7 @@ msgstr ""
 "  -a, --alignment=N           effectuer un alignement des chaînes à N octets "
 "(%d par défaut)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2129,94 +2123,94 @@ msgstr ""
 "      --no-hash               ne pas inclure la table de hachage dans le "
 "fichier binaire\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            afficher les statistiques de traduction\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               afficher plus d'informations\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est absent ou invalide\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est approximatif (fuzzy)\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "AVERTISSEMENT : les versions plus anciennes de « msgfmt » génèreront une "
 "erreur à cet endroit\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Le nom de domaine « %s » n'est pas un nom de fichier approprié"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe "
 "sera utilisé"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "La directive « domain %s » a été ignorée"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "Une chaîne vide « msgstr » a été ignorée"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s : AVERTISSEMENT : le fichier source contient des traductions "
 "approximatives"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"L'option « %c » ne peut être utilisée avant que « J », « K », « T », « C » ou « X "
-"» n'ait été spécifié"
+"L'option « %c » ne peut être utilisée avant que « J », « K », « T », « C » "
+"ou « X » n'ait été spécifié"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2225,7 +2219,7 @@ msgstr ""
 "msggrep permet d'extraire tous les messages d'un catalogue de traduction qui concordent avec\n"
 "un motif particulier ou qui appartiennent à des fichiers sources donnés.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2300,7 +2294,7 @@ msgstr ""
 "  -v, --invert-match          récupère seulement les messages qui ne concordent avec\n"
 "                              aucun critère de sélection\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2308,19 +2302,19 @@ msgstr ""
 "      --escape                utiliser les séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           trier les données en sortie\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          trier la sortie selon l'emplacement des "
 "fichiers\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2331,7 +2325,7 @@ msgstr ""
 "le fichier ABOUT-NLS. Ceci est nécessaire pour pouvoir tester vos "
 "traductions.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2342,12 +2336,12 @@ msgstr ""
 "Veuillez définir la langue à l'aide de l'option « --locale »\n"
 "ou le fichier de sortie .po à l'aide de l'option « --output-file ».\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s a été créé.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2356,12 +2350,12 @@ msgstr ""
 "msginit permet de créer un nouveau fichier .po en initialisant les informations de contexte\n"
 "avec des valeurs provenant de l'environnement de l'utilisateur.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr " -i, --input=FICHIER_ENTRÉE   fichier .pot d'entrée\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2371,14 +2365,14 @@ msgstr ""
 "  Si le nom du fichier d'entrée est « - » ou s'il n'est pas spécifié, les "
 "données sont lues depuis l'entrée standard.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FICHIER   écrire les données en sortie dans le FICHIER "
 "spécifié\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2390,12 +2384,12 @@ msgstr ""
 "fichier de sortie\n"
 "  est « - », les données sont envoyées vers la sortie standard.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          définir la langue cible\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2403,7 +2397,7 @@ msgstr ""
 "      --no-translator         supposer que le fichier .po est produit de "
 "manière automatique\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2412,12 +2406,12 @@ msgstr ""
 "Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
 "input ».\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "Erreur de lecture du dossier actuel"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2426,14 +2420,14 @@ msgstr ""
 "Veuillez spécifier le fichier .pot d'entrée à l'aide de l'option « --"
 "input ».\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "Échec du sous-processus %s avec le code de sortie %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2449,32 +2443,33 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traductions françaises du paquet %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "Le jeu de caractères actuel « %s » n'est pas un nom d'encodage portable"
+msgstr ""
+"Le jeu de caractères actuel « %s » n'est pas un nom d'encodage portable"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
-"Le fichier d'entrée contient deux jeux de caractères différents « %s » et « %"
-"s »"
+"Le fichier d'entrée contient deux jeux de caractères différents « %s » et "
+"« %s »"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
-"Aucun jeu de caractères n'est spécifié dans l'en-tête du fichier d'entrée « %"
-"s »"
+"Aucun jeu de caractères n'est spécifié dans l'en-tête du fichier d'entrée "
+"« %s »"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2483,19 +2478,20 @@ msgstr ""
 "Aucun jeu de caractères n'est spécifié pour le domaine « %s » dans l'en-tête "
 "du fichier d'entrée « %s »"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "Le jeu de caractères cible « %s » n'est pas un nom d'encodage portable."
+msgstr ""
+"Le jeu de caractères cible « %s » n'est pas un nom d'encodage portable."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2505,7 +2501,7 @@ msgstr ""
 "dont l'UTF-8.\n"
 "L'ensemble a été converti en UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2518,7 +2514,7 @@ msgstr ""
 "L'ensemble a été converti en UTF-8.\n"
 "Pour choisir un encodage différent, utilisez l'option « --to-code ».\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2532,7 +2528,7 @@ msgstr ""
 "vous assurer qu'ils sont\n"
 "encodés en UTF-8 depuis l'origine, c-à-d dans vos fichiers de code source.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2545,14 +2541,14 @@ msgstr ""
 "Il se peut que les données de sortie de « %s » soient incorrectes.\n"
 "Pour contourner le problème, vous pouvez :\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 "- assigner à la variable d'environnement LC_ALL un nom de langue ayant "
 "l'encodage %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2563,7 +2559,7 @@ msgstr ""
 "  puis appliquer « %s »,\n"
 "  et reconvertir en %s en utilisant « msgconv ».\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2577,7 +2573,7 @@ msgstr ""
 "  puis appliquer « %s »,\n"
 "  et reconvertir en %s en utilisant « msgconv ».\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2589,26 +2585,26 @@ msgstr ""
 "Il se peut que les données de sortie de « %s » soient incorrectes.\n"
 "Pour contourner le problème, vous pouvez définir LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "L'expression au pluriel peut produire des valeurs négatives."
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi "
 "grande que %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "L'expression au pluriel peut induire une division par zéro."
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "L'expression au pluriel peut induire un débordement d'entier"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2616,52 +2612,52 @@ msgstr ""
 "L'expression au pluriel peut produire une erreur arithmétique, probablement "
 "une division par zéro"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Essayez d'utiliser ce qui suit, valable pour %s :"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 "Le catalogue de messages contient des traductions d'expressions au pluriel"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mais l'attribut « plural=EXPRESSION » est absent de l'en-tête"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "Valeur « nplurals » invalide"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "Expression au pluriel invalide"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mais certains messages n'ont qu'une forme de pluriel"
 msgstr[1] "mais certains messages n'ont que %lu formes de pluriel"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mais certains messages ont une forme de pluriel"
 msgstr[1] "mais certains messages ont %lu formes de pluriel"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2670,97 +2666,98 @@ msgstr ""
 "il manque une entrée « Plural-Forms: nplurals=INTEGER; plural=EXPRESSION; » "
 "dans l'en-tête"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
-"Les chaînes « msgid » et « msgid_plural » ne débutent pas toutes les deux par "
-"« \\n »"
+"Les chaînes « msgid » et « msgid_plural » ne débutent pas toutes les deux "
+"par « \\n »"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr[%u] » ne débutent pas toutes les deux par "
 "« \\n »"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
-"Les chaînes « msgid » et « msgstr » ne débutent pas toutes les deux par « \\n »"
+"Les chaînes « msgid » et « msgstr » ne débutent pas toutes les deux par "
+"« \\n »"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
-"Les chaînes « msgid » et « msgid_plural » ne se terminent pas toutes les deux "
-"par « \\n »"
+"Les chaînes « msgid » et « msgid_plural » ne se terminent pas toutes les "
+"deux par « \\n »"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr[%u] » ne se terminent pas toutes les deux "
 "par « \\n »"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr » ne se terminent pas toutes les deux par "
 "« \\n »"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 "La gestion des formes du pluriel est une extension de la version GNU de "
 "gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "« msgstr » n'a pas de marqueur de raccourci clavier « %c »"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "« msgstr » a trop de marqueurs de raccourcis clavier « %c »"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "Le champ « %s » est absent de l'en-tête\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "Le champ d'en-tête « %s » devrait être au début de la ligne\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "Le champ « %s » a encore sa valeur initiale par défaut\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s : l'entrée n'est pas valide dans l'encodage %s"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
-"%s : erreur pendant la conversion depuis l'encodage « %s » vers l'encodage « %"
-"s »"
+"%s : erreur pendant la conversion depuis l'encodage « %s » vers l'encodage « "
+"%s »"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "Aucun jeu de caractères n'a été défini dans l'en-tête du fichier d'entrée"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2769,17 +2766,17 @@ msgstr ""
 "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv() et "
 "celui-ci ne permet pas cette conversion."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"La conversion de « %s » vers « %s » introduit des doublons : certaines chaînes "
-"« msgids » différentes deviennent identiques."
+"La conversion de « %s » vers « %s » introduit des doublons : certaines "
+"chaînes « msgids » différentes deviennent identiques."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2788,16 +2785,16 @@ msgstr ""
 "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv(), et "
 "cette version a été compilée sans iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s est valable seulement avec %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "Type de sauvegarde"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2823,18 +2820,18 @@ msgstr ""
 "Lorsqu'une correspondance exacte n'est pas possible,\n"
 " une correspondance floue (fuzzy) est utilisée pour produire un meilleur résultat. \n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traduction des anciens messages sources\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     messages sources actuels à traduire\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2844,7 +2841,7 @@ msgstr ""
 "traduction,\n"
 "                              peut être spécifié plusieurs fois\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2854,28 +2851,28 @@ msgstr ""
 "                              ne rien faire si le fichier def.po est déjà à "
 "jour\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Emplacement du fichier de sortie en mode mise à jour :\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "  Le résultat est réécrit dans le fichier def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTRÔLE       créer une sauvegarde de def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2898,77 +2895,73 @@ msgstr ""
 "                              sinon effectuer des sauvegardes simples\n"
 "  simple, never               toujours créer des sauvegardes simples\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Le suffixe de sauvegarde est « ~ », à moins qu'il ne soit défini par l'option "
-"«--suffix »\n"
+"Le suffixe de sauvegarde est « ~ », à moins qu'il ne soit défini par "
+"l'option «--suffix »\n"
 "ou par la variable d'environnement SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching     ne pas utiliser la correspondance floue\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              conserver les précédentes chaînes « msgid » des "
-"messages traduits\n"
+"      --previous              conserver les précédentes chaînes « msgid » "
+"des messages traduits\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       supprimer le témoin de progression\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "Ce message devrait définir des formes au pluriel"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "Ce message ne devrait pas définir de forme au pluriel"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%s lues %ld anciennes + %ld références, %ld fusionnées, %ld approximatives, %"
-"ld manquantes, %ld périmées.\n"
+"%s lues %ld anciennes + %ld références, %ld fusionnées, %ld approximatives, "
+"%ld manquantes, %ld périmées.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " terminé.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s n'est pas compatible avec les noms de fichiers explicites"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "msgunfmt permet de convertir un catalogue binaire de traductions en fichier ."
 "po de type Uniforum\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2977,23 +2970,23 @@ msgstr ""
 "  -j, --java               mode Java : l'entrée est une classe Java "
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                mode C# : l'entrée est un fichier « .dll » de "
 "type .NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      mode ressources C# : l'entrée est un fichier « ."
-"resources » de type .NET\n"
+"      --csharp-resources      mode ressources C# : l'entrée est un fichier "
+"« .resources » de type .NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -3001,17 +2994,17 @@ msgstr ""
 "      --tcl                mode Tcl :  l'entrée est un fichier « .msg » de "
 "type tcl/msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Emplacement du fichier d'entrée en mode Java :\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -3024,12 +3017,12 @@ msgstr ""
 "  L'emplacement de la classe est déterminé par la variable d'environnement "
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Emplacement du fichier d'entrée en mode C# :\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -3040,12 +3033,12 @@ msgstr ""
 "spécifié)\n"
 "  dont le nom dépend de la langue.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Emplacement du fichier d'entrée en mode Tcl :\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -3054,19 +3047,19 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier « .msg » est situé dans le répertoire spécifié.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                indenter la sortie\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                produire une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3087,12 +3080,12 @@ msgstr ""
 "Si l'option « --use-first » est spécifiée, seuls ceux de la première traduction seront utilisés.\n"
 "Les commentaires de position sont cumulés.   Lorsque l'option « --unique » est utilisée, seuls les messages uniques sont conservés.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              afficher seulement les doublons\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3101,7 +3094,7 @@ msgstr ""
 "  -u, --unique                afficher seulement les messages uniques,\n"
 "                              en ignorant les doublons\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -3191,65 +3184,65 @@ msgstr "La première forme du pluriel a un indice non nul"
 msgid "plural form has wrong index"
 msgstr "La forme du pluriel a un indice erroné"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "Trop d'erreurs, on abandonne"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Séquence d'octets multiples invalide"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "Séquence d'octets multiples incomplète à la fin du fichier"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "Séquence d'octets multiples incomplète à la fin de la ligne"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "Échec de « iconv() »"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "Mot clé inconnu : « %s »"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "Séquence de contrôle invalide"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "Fin de fichier au milieu d'une chaîne"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "Fin de ligne au milieu d'une chaîne"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "séparateur de contexte <EOT> à l'intérieur d'une chaîne"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "Double définition de message"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "voici l'endroit de la première occurence"
 
@@ -3337,17 +3330,17 @@ msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "Erreur lors de la conversion depuis l'encodage « %s » vers l'encodage « %s »"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "Deux arguments étaient attendus"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Usage : %s [OPTION] URL FICHIER\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3356,11 +3349,26 @@ msgstr ""
 "urlget permet de récupérer et d'afficher le contenu d'une URL.\n"
 "Si l'URL ne peut être atteintte, le FICHIER local est utilisé.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "Erreur d'écriture sur la sortie standard"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3404,43 +3412,43 @@ msgstr ""
 "Le catalogue de messages contient des formes de traduction au pluriel\n"
 "mais le format de sortie ne les supporte pas."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "Impossible de créer le fichier « %s »"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "sortie standard"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Échec lors de la création du dossier « %s »"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "Échec de compilation de la classe C#. Essayez l'option « --verbose »"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "Échec de compilation de la classe C#"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "« %s » n'est pas un nom de classe Java valide"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Échec de compilation de la classe Java. Essayez l'option « --verbose » ou "
 "définissez $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
@@ -3450,14 +3458,14 @@ msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "Erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "un message à traduire ne doit pas contenir de séquence d'échappement « \\%c »"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3470,7 +3478,7 @@ msgstr ""
 "différent du vôtre. Vous devriez utiliser un msgctxt en pur ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3495,8 +3503,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3523,7 +3531,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "Erreur pendant l'écriture sur le sous-processus %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3531,7 +3539,7 @@ msgstr ""
 "le catalogue de messages contient des traductions dépendantes du contexte\n"
 "mais le format .resources de type C# ne les supporte pas.\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3556,36 +3564,34 @@ msgstr ""
 "mais le format de catalogue de type Tcl ne supporte pas les formes au "
 "pluriel\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d : AVERTISSEMENT : expression rationnelle non terminée"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d : AVERTISSEMENT : constante caractère sans terminaison"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Chaîne non-ASCII repérée à %s%s.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3594,7 +3600,7 @@ msgstr ""
 "%s:%d : séquence d'octets multiples invalide.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3603,7 +3609,7 @@ msgstr ""
 "%s:%d : séquence longue d'octets multiples incomplète.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3612,7 +3618,7 @@ msgstr ""
 "%s:%d : séquence d'octets multiples incomplète à la fin du fichier.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3621,12 +3627,12 @@ msgstr ""
 "%s:%d : séquence d'octets multiples incomplète à la fin de la ligne.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3635,32 +3641,32 @@ msgstr ""
 "%s:%d : séquence d'octets multiples invalide.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d : AVERTISSEMENT : constante chaîne de caractères non terminée"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « ) » trouvé à la place de « } »"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « } » trouvé à la place de « ) »"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3669,52 +3675,55 @@ msgstr ""
 "Le langage « glade » n'est pas supporté. %s utilise expat(),\n"
 "Cette version a été compilée sans expat().\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d : AVERTISSEMENT : substitut isolé U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d : impossible de trouver la terminaison de chaîne « %s » avant la fin du "
-"fichier"
+"%s:%d : impossible de trouver la terminaison de chaîne « %s » avant la fin "
+"du fichier"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d : accolade fermante manquante sur \\x{NOMBRE_HEXA}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d : interpolation invalide (« \\l ») de caractères de 8 bits « %c »"
+msgstr ""
+"%s:%d : interpolation invalide (« \\l ») de caractères de 8 bits « %c »"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d : interpolation invalide (« \\u ») de caractères de 8 bits « %c »"
+msgstr ""
+"%s:%d : interpolation invalide (« \\u ») de caractères de 8 bits « %c »"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d : interpolation invalide de variable à « %c »"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d : interpolation invalide (« \\L ») de caractères de 8 bits « %c »"
+msgstr ""
+"%s:%d : interpolation invalide (« \\L ») de caractères de 8 bits « %c »"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
+msgstr ""
+"%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3723,7 +3732,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3735,7 +3744,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3747,7 +3756,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3759,7 +3768,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3771,7 +3780,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page : http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3783,27 +3792,27 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d : définition de chaîne invalide"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d : nombre manquant après « # »"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d : expression chaîne invalide"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3812,33 +3821,33 @@ msgstr ""
 "%s:%lu : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée "
 "pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur la "
-"sortie standard"
+"L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur "
+"la sortie standard"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On "
 "suppose que c'est du C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "xgettext analyse des fichiers de code source et permet d'en extraire les "
 "chaînes qui peuvent être traduites dans d'autres langues.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3847,13 +3856,13 @@ msgstr ""
 "  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de "
 "messages.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3861,12 +3870,12 @@ msgstr ""
 "  -p, --output-dir=RÉP        créer les fichiers de sortie dans le "
 "répertoire spécifié\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3883,12 +3892,12 @@ msgstr ""
 "                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                              GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3896,7 +3905,7 @@ msgid ""
 msgstr ""
 "  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3905,46 +3914,49 @@ msgstr ""
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "  Par défaut les fichiers d'entrée sont supposés être en ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            joindre les messages au fichier existant\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas "
 "extraites\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=REPÈRE]    ajouter un bloc de commentaire avec un "
 "REPÈRE,\n"
 "                                 (ou ceux précédant les lignes mots clés) "
 "dans le fichier de sortie\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3958,17 +3970,17 @@ msgstr ""
 "C#, awk,\n"
 "                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=MOT]         MOT clé additionnel à rechercher (sans\n"
 "                              MOT clé signifie : ne pas utiliser des mots "
 "clés par défaut)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3979,7 +3991,7 @@ msgstr ""
 "l'intérieur de\n"
 "                              l'argument numéro ARG du MOT clé\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3993,42 +4005,42 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             comprendre les trigrammes ANSI C pour "
 "l'entrée\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                              (seuls les langages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 "      --kde                   reconnaître les chaînes au format KDE 4\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                 reconnaître les chaînes au format Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4036,19 +4048,19 @@ msgstr ""
 "      --debug                 mieux détailler la reconnaissance des chaînes "
 "de format\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     produire un fichier « .properties » de type "
 "Java\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=AUTEUR  définit l'auteur dans la sortie\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4056,18 +4068,18 @@ msgstr ""
 "      --foreign-user          omettre le copyright FSF dans la sortie pour "
 "les utilisateurs étrangers\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAQUET   donne le nom de paquet dans la sortie\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSION  donne la version du paquet dans la sortie\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4075,43 +4087,60 @@ msgstr ""
 "      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les "
 "rapport d'anomalie des msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=PREFIXE]  utiliser un PREFIXE ou « \"\" » pour les "
 "entrées msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=SUFFIXE]  utiliser un SUFFIXE ou « \"\"»  pour les "
 "entrées msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:[pass-]"
 "<drapeau>:%s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s : AVERTISSEMENT : "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4120,16 +4149,16 @@ msgstr ""
 "Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
 "est :%s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Malgré sa déclaration, %s n'est pas une chaîne de format %s valide. La "
 "raison est :%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4143,7 +4172,7 @@ msgstr ""
 "Envisagez d'utiliser une chaîne de format contenant des arguments nommés,\n"
 "et un mapping plutôt qu'un tuple pour les arguments.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4153,29 +4182,30 @@ msgstr ""
 "GNU gettext : gettext(\"\") retourne l'en-tête\n"
 "avec les informations de contexte, pas une chaîne vide.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "Argument ambigu pour le mot clé « %.*s »"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
-"AVERTISSEMENT : contexte absent pour l'argument de pluriel du mot clé « %.*s »"
+"AVERTISSEMENT : contexte absent pour l'argument de pluriel du mot clé « %.*s "
+"»"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 "incohérence de contexte entre la forme du singulier et celle du pluriel"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4187,7 +4217,7 @@ msgstr ""
 "la variable MSGID_BUGS_ADDRESS à cet endroit. Sinon, veuillez\n"
 "utiliser l'option « --msgid-bugs-address » en ligne de commande.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "langage « %s » inconnu"
@@ -4196,6 +4226,33 @@ msgstr "langage « %s » inconnu"
 msgid "<unnamed>"
 msgstr "<sans nom>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s : l'option « --%c » n'est pas permise\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr ""
+#~ "Échec de la fonction « DuplicateHandle » avec le code d'erreur 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Pas encore implanté"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "Impossible d'établir des entrées/sorties non bloquantes pour le sous-"
+#~ "processus %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "Échec de communication avec le sous-processus %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Échec de lecture depuis le sous-processus %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "Sous-processus %s terminé avec le code de sortie %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "Le champ « %s » a encore sa valeur initiale par défaut\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Références multiples à %%%c."
 
@@ -4387,7 +4444,8 @@ msgstr "<sans nom>"
 #~ "                               enlever ceux qui ne sont pas traduits\n"
 #~ "      --untranslated          conserver les non traduits, enlever ceux "
 #~ "traduits\n"
-#~ "      --no-fuzzy              enlever les messages marqués « fuzzy »\n"
+#~ "      --no-fuzzy              enlever les messages marqués "
+#~ "« fuzzy »\n"
 #~ "      --only-fuzzy            conserver les messages marqués "
 #~ "« fuzzy »\n"
 #~ "      --no-obsolete           enlever les messages obsolètes #~\n"
@@ -5143,8 +5201,8 @@ msgstr "<sans nom>"
 #~ "  -s, --sort-output              générer une sortie triée\n"
 #~ "  -F, --sort-by-file             trier la sortie selon la localisation "
 #~ "des fichiers\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid "
+#~ "\"\" »\n"
 #~ "      --copyright-holder=CHAÃ\8eNE  identifier le champ des droits d'auteur "
 #~ "dans la sortie\n"
 #~ "      --foreign-user             inhiber la production d'un copyright "
@@ -5243,8 +5301,8 @@ msgstr "<sans nom>"
 #~ "LIGNE »\n"
 #~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
 #~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid "
+#~ "\"\" »\n"
 #~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
 #~ "indiqué\n"
 #~ "  -p, --output-dir=RÃ\89PERTOIRE    sortir le fichier produit dans tel "
@@ -5262,8 +5320,8 @@ msgstr "<sans nom>"
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -5456,8 +5514,8 @@ msgstr "<sans nom>"
 #~ msgstr ""
 #~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
 #~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid "
+#~ "\"\" »\n"
 #~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
 #~ "indiqué\n"
 #~ "  -p, --output-dir=RÃ\89PERTOIRE    sortir le fichier produit dans tel "

diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 24c687a7b10f8f90b2d99d147ca7faaf888e3bb4..0180c74f9fff517058606d9ee70c6867cc1b4ef6 100644 (file)
--- a/gettext-tools/po/gettext-tools.pot
+++ b/gettext-tools/po/gettext-tools.pot
@@ -6,12 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.17\n"
+"Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,22 +33,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -56,44 +57,44 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr ""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -103,72 +104,71 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr ""
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "%s: option '--%s' requires an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "%s: unrecognized option '--%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
 
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
@@ -182,20 +182,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -205,20 +205,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -237,70 +237,69 @@ msgstr ""
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
+#: gnulib-lib/w32spawn.h:40
 #, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
+msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:81
 #, c-format
-msgid "_open_osfhandle failed"
+msgid "cannot restore fd %d: dup2 failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 
 #: src/format-boost.c:449
@@ -325,9 +324,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -367,48 +366,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -500,19 +499,18 @@ msgstr ""
 #: src/format-java.c:745
 #, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -526,11 +524,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -578,12 +576,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 
 #: src/format-perl.c:433
@@ -593,54 +591,51 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -677,11 +672,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -690,38 +685,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -754,29 +749,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -785,11 +780,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
@@ -798,325 +793,343 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1130,105 +1143,97 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr ""
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr ""
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1239,81 +1244,86 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr ""
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1326,74 +1336,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr ""
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr ""
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1402,22 +1412,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr ""
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1427,67 +1437,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr ""
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1495,210 +1505,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1707,48 +1699,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1756,33 +1748,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1790,109 +1782,109 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1932,30 +1924,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1963,24 +1955,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -1988,54 +1980,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2047,54 +2039,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2103,7 +2095,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2112,7 +2104,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2121,12 +2113,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2134,7 +2126,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2143,7 +2135,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2151,185 +2143,185 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, c-format
-msgid "field `%s' still has initial default value\n"
+msgid "header field `%s' still has the initial default value\n"
 msgstr ""
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2343,51 +2335,51 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2399,7 +2391,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2407,94 +2399,91 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr ""
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2502,41 +2491,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2549,19 +2538,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2637,65 +2626,65 @@ msgstr ""
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr ""
 
@@ -2778,28 +2767,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr ""
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr ""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2831,41 +2835,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr ""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2875,13 +2879,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2890,7 +2894,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2907,8 +2911,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -2925,13 +2929,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr ""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -2949,154 +2953,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3104,7 +3103,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3112,7 +3111,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3120,7 +3119,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3128,7 +3127,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3136,77 +3135,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3218,58 +3217,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3278,14 +3280,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3293,7 +3295,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3302,119 +3304,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3423,34 +3442,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3458,7 +3477,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""

diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 335e6a305188f150ce1a36328c5985b3cdd06703..80dcec5a1c3564a0ce4eeef94ead3a3ae4c068db 100644 (file)
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.39\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-07-28 17:00+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.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"
@@ -35,22 +36,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
@@ -59,44 +60,44 @@ msgstr "non se pode crea-lo ficheiro de sa
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -106,74 +107,73 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a opción `%s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a opción `--%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a opción `%c%s' non permite ningún argumento\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a opción `%s' require un argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opción `--%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opción `%c%s' descoñecida\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opción non válida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: a opción require un argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: a opción `-W %s' é ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a opción `%s' require un argumento\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,20 +185,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -208,20 +208,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -240,70 +240,69 @@ msgstr "non se pode crea-lo ficheiro de sa
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "non se pode crea-lo ficheiro de saída \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
 #: src/format-boost.c:449
@@ -328,9 +327,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
@@ -371,48 +370,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -504,19 +503,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -530,11 +528,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -582,13 +580,13 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
 #: src/format-perl.c:433
@@ -598,56 +596,53 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "o número de especificacións de formato en `msgid' e `msgstr' non coincide"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "as especificacións de formato do argumento %lu non son as mesmas"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -684,11 +679,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -697,38 +692,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Use `%s --help' para máis información.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -761,29 +756,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -792,11 +787,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
@@ -806,294 +801,312 @@ msgstr "Comunique os erros a <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1115,31 +1128,31 @@ msgstr ""
 "  -V, --version            amosa-la información da versión e saír\n"
 "  -w, --width=NÚMERO       establece-la anchura da páxina de saída\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "o criterio de selección indicado é imposible (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1169,105 +1182,97 @@ msgstr ""
 "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
 "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros PO.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1293,81 +1298,86 @@ msgstr ""
 "un emparellamento exacto, úsase coincidencia difusa, de xeito que se produza\n"
 "un mellor diagnóstico.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensaxe úsase mais non está definida..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais esta definición é semellante"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "atopouse %d erro grave"
 msgstr[1] "atopáronse %d erros graves"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "téñense que indicar polo menos dous ficheiros"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1396,74 +1406,74 @@ msgstr ""
 "comentarios e comentarios de extracción mantéñense, pero só do primeiro\n"
 "ficheiro para definilos.  Mantéñense as posicións de tódolos ficheiros PO.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "precísanse exactamente dous ficheiros de entrada"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1472,22 +1482,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "faltan argumentos"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1497,67 +1507,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "faltan argumentos"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "téñense que indicar polo menos dous ficheiros"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1565,210 +1575,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaxe traducida"
 msgstr[1] "%d mensaxes traducidas"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traduccións difusas"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaxe sen traducir"
 msgstr[1] ", %d mensaxes sen traducir"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1777,48 +1769,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1826,33 +1818,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1860,117 +1852,117 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Falta o código de caracteres na cabeceira.\n"
 "A conversión da mensaxe ao código do usuario non vai funcionar.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: a cabeceira do ficheiro PO non existe, é 'fuzzy' ou é inválida\n"
 "%*s  aviso: a conversión de código de caracteres non vai funcionar"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "o nome de dominio \"%s\" non é axeitado para nome de ficheiro"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "o nome de dominio \"%s\" non é axeitado como nome de ficheiro:\n"
 "empregarase un prefixo"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorada"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "entrada `msgstr' baleira ignorada"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "entrada `msgstr' difusa ignorada"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traduccións difusas"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2010,30 +2002,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2041,24 +2033,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2066,54 +2058,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2125,54 +2117,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: aviso: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2181,7 +2173,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2190,7 +2182,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2199,12 +2191,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2212,7 +2204,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2221,7 +2213,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2229,159 +2221,159 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "secuencia de control ilegal"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensaxe úsase mais non está definida en %s"
 msgstr[1] "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non comezan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "as entradas `msgid' e `msgid_plural' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr[%u]' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "as entradas `msgid' e `msgstr' non rematan ámbalas dúas con '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "falta o campo `%s' na cabeceira"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' da cabeceira tería que comezar ao principio da liña"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "o campo `%s' aínda ten o valor inicial por defecto"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "algúns campos da cabeceira aínda teñen o valor inicial por defecto"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2390,15 +2382,15 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de\n"
 "iconv(), e iconv() non soporta \"%s\".\n"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2407,17 +2399,17 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
 "Esta versión foi compilada sen iconv().\n"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
 # src/msgmerge.c:324
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2442,51 +2434,51 @@ msgstr ""
 "para producir mellores resultados.  Os resultados escríbense na saída\n"
 "estándar a menos que se indique un ficheiro de saída.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2498,7 +2490,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2506,96 +2498,93 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensaxe úsase mais non está definida en %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan %"
-"ld, obsoletas %ld.\n"
+"%sLidas %ld antigas + %ld referencias, mesturadas %ld, difusas %ld, faltan "
+"%ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " rematado.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2603,41 +2592,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2650,19 +2639,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2748,65 +2737,65 @@ msgstr "a primera forma do plural ten un 
 msgid "plural form has wrong index"
 msgstr "a forma do plural ten un índice erróneo"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secuencia multibyte non válida"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palabra chave \"%s\" descoñecida"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "secuencia de control ilegal"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "fin de ficheiro nunha cadea"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "fin de liña nunha cadea"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definición de mensaxe duplicada"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...este é o lugar da primeira definición"
@@ -2896,28 +2885,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para lectura"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "demasiados argumentos"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2949,41 +2953,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "non se pode crea-lo ficheiro de saída \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "saída estándar"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2993,14 +2997,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir \"%s\" para escribir"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "as mensaxes internacionalizadas non deben conte-la secuencia de escape `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3009,7 +3013,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3026,8 +3030,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3044,13 +3048,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "erro ao escribi-lo ficheiro \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3068,99 +3072,96 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3169,55 +3170,53 @@ msgstr ""
 "O código de caracteres \"%s\" non está soportado. %s depende de iconv().\n"
 "Esta versión foi compilada sen iconv().\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opción non válida -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3225,7 +3224,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3233,7 +3232,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3241,7 +3240,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3249,7 +3248,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3257,77 +3256,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "non se pode usar --join-existing cando a saída se escribe en stdout"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non funciona sen palabras chave polas que buscar"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: o ficheiro `%s' coa extensión `%s' é descoñecido; tentaráse C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "non se indicou ningún ficheiro de entrada"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3339,58 +3338,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3399,14 +3401,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3414,7 +3416,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3423,119 +3425,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: aviso: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3544,34 +3563,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3579,7 +3598,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "linguaxe `%s' descoñecida"
@@ -3588,6 +3607,13 @@ msgstr "linguaxe `%s' desco
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opción ilegal -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "o campo `%s' aínda ten o valor inicial por defecto"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -3860,8 +3886,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -3887,8 +3913,8 @@ msgstr ""
 #~ "Os argumentos obrigatorios para as opcións longas son tamén obrigatorios "
 #~ "para\n"
 #~ "as opcións curtas.\n"
-#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NÚMERO      aliña-las cadeas a NÚMERO bytes (defecto: "
+#~ "%d)\n"
 #~ "  -c, --check                 facer comprobacións dependentes da "
 #~ "linguaxe\n"
 #~ "                              nas cadeas\n"

diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 24fbd7aeb801e1697e3dde57b94582d27c59e903..dc6706874a98a3223e2ec93262f5839d11ce3fd0 100644 (file)
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-11 11:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -33,24 +33,24 @@ msgstr "argumen %s ambigu untuk %s"
 msgid "Valid arguments are:"
 msgstr "Argumen yang valid adalah:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "tidak dapat menghapus berkas sementara %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "tidak dapat menghapus direktori sementara %s"
@@ -59,10 +59,10 @@ msgstr "tidak dapat menghapus direktori sementara %s"
 msgid "write error"
 msgstr "tulis error"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
@@ -88,8 +88,8 @@ msgstr "error ketika menulis \"%s\""
 msgid "error after reading \"%s\""
 msgstr "error setelah membaca \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,74 +106,73 @@ msgstr "C# kompiler tidak ditemukan, coba pasang pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# mesin maya tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Sistem error tidak diketahui"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subproses gagal"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opsi `%s' rancu\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opsi `--%s' tidak membolehkan argumen\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opsi `%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opsi tidak diketahui `--%s'\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opsi tidak diketahui `%c%s'\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opsi tidak legal -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opsi tidak valid -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opsi `-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opsi `-W %s' tidak membolehkan sebuah argumen\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,14 +184,14 @@ msgstr "argumen source_version tidak valid untuk compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumen target_version tidak valid untuk compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gagal untuk membuat \"%s\""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -208,8 +207,8 @@ msgstr "Kompiler java tidak ditemukan, coba pasang gcj atau set $JAVAC"
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Mesin maya java tidak ditemukan, coba pasang gij atau set $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
@@ -221,8 +220,8 @@ msgstr "%s subproses I/O error"
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "tidak dapat membuat pipe"
@@ -283,7 +282,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -294,7 +293,7 @@ msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -302,7 +301,7 @@ msgstr "sebuah spesifikasi format untuk argumen %u tidak ada dalam '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -749,11 +748,11 @@ msgstr ""
 "Karakter yang mengakhiri nomor direktif %u bukan sebuah angka diantara 1 dan "
 "9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -766,38 +765,38 @@ msgstr ""
 "Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN]\n"
@@ -833,29 +832,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
@@ -864,11 +863,11 @@ msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 
@@ -877,30 +876,30 @@ msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "tidak dapat mendapatkan nama host"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "di paling tidak satu berkas masukan diijinkan"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -909,32 +908,32 @@ msgstr ""
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Argumen wajib untuk opsi panjang juga wajib untuk opsi pendek juga.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -942,34 +941,34 @@ msgstr ""
 "  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian "
 "masukan berkas\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
 "masukan yang dibaca.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -978,12 +977,12 @@ msgstr ""
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Pemilihan pesan:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -991,7 +990,7 @@ msgstr ""
 "      --translated            simpan terjemahan, hapus pesan tidak "
 "diterjemahkan\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -999,52 +998,52 @@ msgstr ""
 "      --untranslated          simpan tidak terjemahkan, hapus pesan "
 "terjemahan\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            simpan pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           hapus pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         simpan pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulasi atribut:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set seluruh pesan 'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "     --clear-fuzzy            set seluruh pesan non-'fuzzy'\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set seluruh pesan sudah ditinggalkan\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set seluruh pesan tidak ditinggalkan\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1052,7 +1051,7 @@ msgid ""
 msgstr ""
 "      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1060,7 +1059,7 @@ msgstr ""
 "      --only-file=BERKAS.po   hanya manipulasi masukan terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1068,13 +1067,13 @@ msgstr ""
 "      --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim untuk --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1082,16 +1081,16 @@ msgstr ""
 "      --obsolete               sinonim untuk --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1099,8 +1098,8 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam .properties "
 "sintaks Java\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1109,26 +1108,51 @@ msgstr ""
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NexTstep/GNUstep\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 gunakan selalu warna dan atribut teks lain.\n"
+"      --color=KETIKA          gunakan warna dan atribut teks lain jika "
+"KETIKA.\n"
+"                              KETIKA dapat berupa 'always', 'never', 'auto', "
+"atau 'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --"
+"color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             jangan gunakan C escape dalam keluaran (baku)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1136,69 +1160,69 @@ msgstr ""
 "  -E, --escape                gunakan C escape dalam keluaran, bukan "
 "karakter ekstensi\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              tulis berkas PO walaupun itu kosong\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                tulis strict Uniforum konform berkas .po\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     tulis sebuah berkas .properties Java\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1209,28 +1233,28 @@ msgstr ""
 "                              dari lebar halaman keluaran, dalam beberapa "
 "beris\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
@@ -1257,25 +1281,25 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan dijaga.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
 "BERKAS\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1294,7 +1318,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih besar dari \n"
 "                              definisi ini, baku ke 0 jika tidak diset\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1303,8 +1327,8 @@ msgstr ""
 "  -u, --unique                kependekan untuk --less-than=2, diminta\n"
 "                              hanya pesan unik untuk ditampilkan\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1312,8 +1336,8 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam sintaks ."
 "properties Java\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1322,12 +1346,12 @@ msgstr ""
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMA          pengkodean untuk keluaran\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1338,49 +1362,28 @@ msgstr ""
 "                              setiap pesan, jangan gabungkan beberapa "
 "terjemahan.\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 gunakan selalu warna dan atribut teks lain.\n"
-"      --color=KETIKA          gunakan warna dan atribut teks lain jika "
-"KETIKA.\n"
-"                              KETIKA dapat berupa 'always', 'never', 'auto', "
-"atau 'html'.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --"
-"color\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter MIller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "dibutuhkan tepat 2 berkas input"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
@@ -1412,12 +1415,12 @@ msgstr "  def.po                      terjemahan\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referensi ke sumber\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operasi pemodifikasi:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1426,7 +1429,7 @@ msgstr ""
 "  -m, --multi-domain          aplikasikan ref.pot ke setiap dari domain "
 "dalam def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     jangan gunakan fuzzy matching\n"
@@ -1452,17 +1455,17 @@ msgstr "pesan ini tidak diterjemahkan"
 msgid "this message needs to be reviewed by the translator"
 msgstr "pesan ini butuh untuk diulas oleh penerjemah"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "pesan ini digunakan tapi tidak didefinisikan..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...tetapi definisi ini serupa"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1479,12 +1482,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "ditemukan %d kesalahan fatal"
 msgstr[1] "ditemukan %d kesalahan fatal"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "paling tidak dua berkas harus dispesifikasikan"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1504,7 +1507,7 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan diakumulasikan.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1513,7 +1516,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1521,63 +1524,63 @@ msgstr ""
 "      --omit-header           jangan tulis header dengan masukan `msgid "
 "\"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Target konversi:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                gaya keluaran terindentasi\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           tekan '#: nama berkas:baris' baris\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          simpan '#: nama berkas: baris' baris (baku)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tepatnya sebuah berkas masukan dibutuhkan"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1590,7 +1593,7 @@ msgstr ""
 "(secara umum dibuat oleh xgettext). Masukan yang tidak diterjemahkan diberikan\n"
 "sebuah terjemahan yang identik dengan msgid.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO atau POT\n"
@@ -1629,7 +1632,7 @@ msgstr ""
 "Sebuah perintah bawaan dipanggil '0' mengeluarkan terjemahan, diikuti oleh sebuah\n"
 "null byte. Keluaran dari \"msgexec 0\" cocok sebagai sebuah masukan untuk \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
@@ -1644,29 +1647,29 @@ msgstr "penulisan ke stdout gagal"
 msgid "write to %s subprocess failed"
 msgstr "tulis ke %s subproses gagal"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "hilang nama penyaring"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak sebuah script sed harus dispesifikasikan"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
 "terjemahan.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1676,19 +1679,19 @@ msgstr ""
 "standar masukan\n"
 "dan menulis sebuah terjemahan termodifikasi ke standar keluaran.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Sangat berguna FILTER-OPTIONs ketika PENYARING adalah 'sed':\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     tambahkan SCRIPT ke perintah yang dijalankan\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1698,14 +1701,14 @@ msgstr ""
 "  -f, --file=SCRIPTFILE       tambahkan isi dari SCRIPTFILE ke perintah\n"
 "                                untuk dijalankan\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       tekan pencetakan otomatis dari ruang pola\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1713,12 +1716,12 @@ msgstr ""
 "      --no-escape             jangan gunakan C escapes dalam keluaran "
 "(baku)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1737,22 +1740,22 @@ msgid "invalid endianness: %s"
 msgstr "endianness tidak valid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s hanya valid dengan %s atau %s"
@@ -1800,7 +1803,7 @@ msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Hasilkan katalog pesan binari dari deskripsi tekstual terjemahan.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1814,7 +1817,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
@@ -1868,7 +1871,7 @@ msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
@@ -1878,13 +1881,13 @@ msgstr "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
 msgid "Output file location in Java mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode Java:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     nama resource\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1916,7 +1919,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1939,7 +1942,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1954,7 +1957,7 @@ msgstr ""
 "Opsi -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
 "dispesifikasikan.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
@@ -2041,7 +2044,7 @@ msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            tampilkan statistik mengenai terjemahan\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
@@ -2099,7 +2102,7 @@ msgstr "masukan fuzzy `msgstr' diabaikan"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2110,7 +2113,7 @@ msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2119,7 +2122,7 @@ msgstr ""
 "opsi '%c' tidak dapat digunakan sebelum 'J' atau 'K' atau 'T' atau 'C' atau "
 "'X' telah dispesifikasikan"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2128,7 +2131,7 @@ msgstr ""
 "Ekstrak seluruh pesan dari sebuah katalog terjemahan yang cocok dengan pola\n"
 "yang diberikan atau milik dari beberapa berkas sumber yang diberikan.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2203,7 +2206,7 @@ msgstr ""
 "  -v, --invert-match          keluarkan hanya pesan yang tidak cocok dengan\n"
 "                              kriteria pemilihan apapun\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2211,18 +2214,18 @@ msgstr ""
 "      --escape                gunakan C escapes dalam keluaran, tidak ada "
 "karakter ekstensi\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2232,7 +2235,7 @@ msgstr ""
 "variabel lingkungan LANG anda, seperti dijelaskan dalam berkas ABOUT-NLS.\n"
 "Ini diperlukan sehingga anda dapat memeriksa terjemahan anda.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2243,12 +2246,12 @@ msgstr ""
 "Mohon spesifikasikan lokal melalui opsi --locale atau\n"
 "berkas keluaran .po melalui opsi --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Dibuat %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2257,12 +2260,12 @@ msgstr ""
 "Dibuat sebuah berkas PO baru, menginisialisasi informasi meta dengan nilai\n"
 "lingkungan pengguna.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  berkas masukan POT\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2273,14 +2276,14 @@ msgstr ""
 "untuk\n"
 "berkas POT. Jika ini adalah -, standar masukan dibaca.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas PO yang "
 "dispesifikasikan\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2290,12 +2293,12 @@ msgstr ""
 "--locale atau konfigurasi lokal pengguna. Jika ini adalah -, hasil akan\n"
 "ditulis ke standar keluaran.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target lokal\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2303,7 +2306,7 @@ msgstr ""
 "      --no-translator         asumsikan berkas PO secara otomatis "
 "dihasilkan\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2311,12 +2314,12 @@ msgstr ""
 "Ditemukan lebih dari satu berkas .pot.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui opsi --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "error membaca direktori disini"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2324,14 +2327,14 @@ msgstr ""
 "Tidak ditemukan berkas .pot dalam direktori ini.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui opsi --input.\n"
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subproses gagal dengan kode keluar %d"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2347,7 +2350,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Terjemahan bahasa inggris untuk paket %s"
@@ -2387,7 +2390,7 @@ msgstr "target set karakter \"%s\" bukan sebuah nama pengkodean yang portabel."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2639,7 +2642,7 @@ msgstr ""
 "set karakter"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2658,7 +2661,7 @@ msgstr ""
 "berbeda menjadi sama."
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2667,16 +2670,16 @@ msgstr ""
 "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(). Versi "
 "ini dibuat tanpa iconv()."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s hanya valid dengan %s"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipe backup"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2698,18 +2701,18 @@ msgstr ""
 "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
 "ke stdout kecuali diberikan sebuah output berkas.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      terjemahan mereferensikan ke sumber lama\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referensi ke sumber baru\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2718,7 +2721,7 @@ msgstr ""
 "  -C, --compendium=BERKAS     perpustakaan tambahan dari pesan terjemahan,\n"
 "                              mungkin dispesifikasikan lebih dari sekali.\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2727,27 +2730,27 @@ msgstr ""
 "  -U, --update                perbarui def.po,\n"
 "                              jangan lakukan apapun jika def.po telah baru\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode perbarui:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Hasil ditulis kembali ke def.po.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        buat sebuah backup dari def.po\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AKHIRAN        override akhiran backup biasa\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2767,7 +2770,7 @@ msgstr ""
 "ada\n"
 "  simple, never   selalu membuat backup sederhana\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2777,7 +2780,7 @@ msgstr ""
 "Akhiran backup adalah `~', kecuali diset dengan --suffix atau "
 "SIMPLE_BACKUP_SUFFIX\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2785,22 +2788,22 @@ msgstr ""
 "      --previous              simpan msgids sebelumnya dari pesan yang "
 "diterjemahkan\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       tekan indikator perkembangan\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pesan ini seharusnya mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pesan ini seharusnya tidak mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2809,28 +2812,28 @@ msgstr ""
 "%sMembaca %ld lama + %ld referensi, digabung %ld, fuzzy %ld, hilang %ld, "
 "sudah ditinggalkan %ld.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " selesai.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s dan nama berkas eksplisit adalah mutually exclusive"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Konversikan katalog pesan binari ke gaya berkas .po Uniforum\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2839,14 +2842,14 @@ msgstr ""
 "  -j, --java                  Mode java: masukan adalah sebuah Java "
 "ResourceBundle class\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                mode C#: masukan adalah sebuah berkas .dll ."
 "NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2855,7 +2858,7 @@ msgstr ""
 "      --csharp-resources      mode resources C#: masukan adalah sebuah "
 "berkas .resources .NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2863,17 +2866,17 @@ msgstr ""
 "      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg "
 "tcl/msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  BERKAS ...                  berkas masukan .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Lokasi berkas masukan dalam mode Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2884,12 +2887,12 @@ msgstr ""
 "dipisahkan dengan sebuah garis bawah. Kelas ditempatkan menggunakan "
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Lokasi berkas masukan dalam mode C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2898,12 +2901,12 @@ msgstr ""
 "Opsi -l dan -d adalah wajib. Berkas .dll berada dalam sebuah subdirektori\n"
 "dari direktori yang dispesifikasikan yang namanya tergantung dari lokal.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Lokasi berkas masukan dalam mode Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2912,17 +2915,17 @@ msgstr ""
 "Opsi -l dan -d adalah wajib. Berkas .msg berada dalam direktori yang\n"
 "dispesifikasikan.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                tulis keluaran gaya berindentasi\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                tulis gaya strict uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2943,12 +2946,12 @@ msgstr ""
 ", mereka akan diambil dari terjemahan pertama. Posisi berkas akan dijaga.\n"
 "Ketika menggunakan opsi --unique, duplikasi diabaikan.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tampilkan hanya duplikasi\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3091,7 +3094,7 @@ msgstr "akhir-dari-baris dalam string"
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
@@ -3276,32 +3279,32 @@ msgstr "tidak dapat membuat berkas output \"%s\""
 msgid "standard output"
 msgstr "standard keluaran"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "gagal membuat direktori \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilasi dari kelas C# gagal, mohon coba --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "bukan sebuah nama kelas Java yang valid: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba --verbose atau set $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
@@ -3431,7 +3434,7 @@ msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3533,32 +3536,32 @@ msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: tidak dapat menemukan pengakhir string \"%s\" dimanapun sebelum EOF"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: hilan kurung kanan di \\x{ANGKA HEKSA}"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\l\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\u\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: variabel interpolasi tidak valid di \"%c\""
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\U\") dari karakter 8bit \"%c\""
@@ -3667,28 +3670,28 @@ msgstr ""
 "%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
 "keamanan; lebih baik gunakan eval_gettext"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "peringatan: berkas `%s' ekstensi `%s' tidak dikenal; akan mencoba C"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3697,14 +3700,14 @@ msgstr ""
 "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
 "messages.po)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=BERKAS         tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3712,12 +3715,12 @@ msgstr ""
 "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
 "direktori DIR\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3736,12 +3739,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3749,7 +3752,7 @@ msgid ""
 msgstr ""
 "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3758,24 +3761,24 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Secara baku berkas masukan diasumsikan berada dalam ASCII.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3788,17 +3791,17 @@ msgstr ""
 "                               baris kata kunci yang mengawalinya) dalam "
 "berkas keluaran\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opsi spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3811,7 +3814,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3821,7 +3824,7 @@ msgstr ""
 "                              KATA berarti tidak menggunakan kata kunci "
 "baku)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3831,7 +3834,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3844,56 +3847,56 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             pahami ANSI C trigraphs untuk masukan\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3901,17 +3904,17 @@ msgstr ""
 "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
 "pengguna luar negri\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    set nama paket dalam keluaran\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSI    set versi paket dalam keluaran\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3919,7 +3922,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
 "bugs\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3929,7 +3932,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]  gunakan STRING atau \"\" sebagai awalan "
 "untuk masukan msgstr\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3939,7 +3942,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=STRING]  gunakan STRING atau \"\" sebagai akhiran "
 "untuk masukan msgstr\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3948,31 +3951,31 @@ msgstr ""
 "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
 "sintaks: %s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3981,7 +3984,7 @@ msgstr ""
 "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
 "format string %s valid. Karena: %s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3990,7 +3993,7 @@ msgstr ""
 "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
 "valid. Karena: %s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4005,7 +4008,7 @@ msgstr ""
 "bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4015,27 +4018,27 @@ msgstr ""
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4047,7 +4050,7 @@ msgstr ""
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah opsi baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
@@ -4056,6 +4059,9 @@ msgstr "bahasa `%s' tidak dikenal"
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opsi tidak legal -- %c\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle gagal dengan kode error 0x%08x"
 

diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index fc3530d023b8b4decd4e1813a630cdace1b30910..08a20ddb893026271551cbb43898fa7d82450bad 100644 (file)
--- a/gettext-tools/po/it.po
+++ b/gettext-tools/po/it.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-30 17:52+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -32,23 +33,23 @@ msgstr "argomento %s ambiguo per %s"
 msgid "Valid arguments are:"
 msgstr "Sono argomenti validi:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr ""
 "impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "impossibile creare la directory temporanea usando il modello \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "impossibile rimuovere il file temporaneo \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "impossibile rimuovere la directory temporanea \"%s\""
@@ -57,44 +58,44 @@ msgstr "impossibile rimuovere la directory temporanea \"%s\""
 msgid "write error"
 msgstr "errore di scrittura"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errore durante l'apertura di \"%s\" in lettura"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "impossibile aprire il file di backup \"%s\" in scrittura"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "errore durante la scrittura di \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "errore dopo la lettura di \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() non riuscito"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Compilatore C# non trovato, provare a installare pnet"
@@ -104,74 +105,73 @@ msgstr "Compilatore C# non trovato, provare a installare pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Macchina virtuale C# non trovata, provare a installare pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "sottoprocesso %s non riuscito"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: l'opzione \"%s\" è ambigua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opzione \"--%s\" non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opzione illecita -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opzione non valida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,20 +183,20 @@ msgstr "argomento source_version di compile_java_class non valido"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argomento target_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "creazione di \"%s\" non riuscita"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -209,20 +209,20 @@ msgstr ""
 "Macchina virtuale Java non trovata, provare a installare gij o a impostare "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "errore di I/O nel sottoprocesso %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -241,74 +241,73 @@ msgstr "impossibile creare la pipe"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "\""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle fallito con codice di errore 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle non riuscito"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "impossibile creare il file di output \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "sottoprocesso %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "il sottoprocesso %s ha ricevuto il segnale fatale %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "\"%s\" non è una stringa di formato %s valida, diversamente da \"msgid\". "
 "Motivo: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "la specifica di formato per l'argomento %u, come in \"%s\", non esiste in "
 "\"msgid\""
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "la specifica di formato per l'argomento %u non esiste in \"%s\""
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "le specifiche di formato in \"msgid\" e \"%s\" per l'argomento %u non sono "
 "le stesse"
@@ -341,9 +340,9 @@ msgstr ""
 "La stringa fa riferimento all'argomento numero %u ma ignora l'argomento "
 "numero %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 "il numero di specifiche di formato in \"msgid\" e \"%s\" non corrisponde"
 
@@ -392,18 +391,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "La stringa contiene una \"}\" solitaria dopo la direttiva numero %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "Nella direttiva numero %u, la combinazione delle opzioni non è valida."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -412,7 +411,7 @@ msgstr ""
 "Nella direttiva numero %u, il numero di argomento per la precisione deve "
 "essere uguale a %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -420,25 +419,25 @@ msgid ""
 msgstr ""
 "Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 "Nella direttiva numero %u, la specificazione di precisione non è valida."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "Nella direttiva numero %u, non sono ammesse opzioni prima di \"%c\"."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "\"msgid\" usa %%m ma \"%s\" non lo usa"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "\"msgid\" non usa %%m ma \"%s\" usa %%m"
 
 #: src/format-invalid.h:22
@@ -548,23 +547,22 @@ msgstr ""
 "\", \"#\" o \"%s\"."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "la specifica di formato per l'argomento {%u}, come in \"%s\", non esiste in "
 "\"msgid\""
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "la specifica di formato per l'argomento {%u}, non esiste in \"%s\""
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "la specifica di formato in \"msgid\" e \"%s\" per l'argomento {%u} non sono "
 "le stesse"
@@ -582,11 +580,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "Nella direttiva numero %u, sono stati indicati troppi parametri; previsto %u "
 "parametro al massimo."
@@ -641,13 +639,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "La stringa fa riferimento a qualche argomento in modi incompatibili."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "le specifiche di formato in \"msgid\" e \"%s\" non sono equivalenti"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in "
 "\"msgid\""
@@ -661,12 +659,12 @@ msgstr ""
 "Nella direttiva %u, lo specificatore di dimensione è incompatibile con lo "
 "specificatore di conversione \"%c\"."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una specifica di formato per l'argomento \"%s\" non esiste in \"%s\""
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -674,53 +672,50 @@ msgstr ""
 "La stringa fa riferimento ad argomenti attraverso specificazioni di "
 "argomenti sia con nome che senza nome."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La stringa fa riferimento all'argomento chiamato \"%s\" in modi "
 "incompatibili."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "le specifiche di formato in \"msgid\" prevedono una mappatura, quelle in \"%s"
 "\" prevedono una tupla"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "le specifiche di formato in \"msgid\" prevedono una tupla, quelle in \"%s\" "
 "prevedono una mappatura"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "la specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
 "in \"msgid\""
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "le specifiche di formato in \"msgid\" e \"%s\" per l'argomento \"%s\" non "
 "sono le stesse"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "'msgid' è una stringa di formato semplice, ma '%s' non lo è: contiene una "
 "flag 'L' o un argomento numerico a due cifre"
@@ -766,11 +761,11 @@ msgid ""
 msgstr ""
 "Il carattere che termina la direttiva numero %u  non è una cifra tra 1 e 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -784,38 +779,38 @@ msgstr ""
 "Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uso: %s [OPZIONE]\n"
@@ -851,29 +846,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            indirizzi per il nome dell'host\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
@@ -882,11 +877,11 @@ msgstr "  -V, --version               mostra le informazioni sulla versione ed e
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -895,30 +890,30 @@ msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "impossibile ottenere il nome dell'host"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "è permesso al massimo un file di input"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -927,10 +922,10 @@ msgstr ""
 "Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
 "e manipola gli attributi.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -938,23 +933,23 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
 "corte.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Posizione del file di input:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FILEINPUT                   file PO di input\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -963,31 +958,31 @@ msgstr ""
 "file\n"
 "                              di input\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Posizione del file di output:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      scrive l'output sul file specificato\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -996,12 +991,12 @@ msgstr ""
 "I risultati vengono scritti su standard output quando nessun file di output\n"
 "è specificato o è -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selezione dei messaggi:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1010,7 +1005,7 @@ msgstr ""
 "messaggi\n"
 "                              non tradotti\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1018,54 +1013,54 @@ msgstr ""
 "      --untranslated          mantiene i messaggi non tradotti, rimuove i\n"
 "                              messaggi tradotti\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene i messaggi marcati come \"fuzzy\"\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           rimuove i messaggi  #~ obsoleti\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene i messaggi #~ obsoleti\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipolazione degli attributi:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             rende \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           rende non \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          rende obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        rende non obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1074,42 +1069,42 @@ msgstr ""
 "      --clear-previous        elimina i \"previous msgid\" da tutti i "
 "messaggi\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipola solo le voci elencate in FILE.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipola solo le voci non elencate in FILE.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinonimo di --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sinonimo di --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintassi del file di input:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1117,8 +1112,8 @@ msgstr ""
 "  -P, --properties-input      il file di input usa la sintassi Java ."
 "properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1128,17 +1123,40 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Dettagli di output:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 usa sempre colori e altri attributi\n"
+"      --color=QUANDO          usa colori e altri attributi solo QUANDO.\n"
+"                              QUANDO può essere 'always', 'never', 'auto', o "
+"'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=FILESTILE       specifica il file di stile CSS per --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1146,9 +1164,9 @@ msgstr ""
 "  -e, --no-escape             non usa gli escape del C nell'output "
 "(predefinito)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1157,29 +1175,29 @@ msgstr ""
 "carattere\n"
 "                              esteso\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              scrive il file PO anche se vuoto\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                scrive il file .po usando lo stile indentato\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           non scrive le righe \"#: nomefile:riga\"\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1188,40 +1206,40 @@ msgstr ""
 "\" (predefinito)\n"
 "\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                genera un file .po in formato Uniforum strict\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     genera un file Java .properties\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    genera un file NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          imposta la larghezza della pagina\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1231,16 +1249,16 @@ msgstr ""
 "lunghe\n"
 "                              della larghezza della pagina\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera un output ordinato\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1248,18 +1266,18 @@ msgstr ""
 "file\n"
 
 # ******************* parte 2 inizia qui *********************
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]...\n"
 
 # FIXME: commonality: somiglianza?
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1282,24 +1300,24 @@ msgstr ""
 "è usata, nel qual caso solo quelli nel primo file PO vengono usati.\n"
 "Le posizioni nei file da tutti i file PO vengono accumulate.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FILEINPUT ...               file di input\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Se il file di input è -, viene letto lo standard input.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1308,7 +1326,7 @@ msgstr ""
 "  -<, --less-than=NUMERO      stampa i messaggi with con meno di NUMERO\n"
 "                              definizioni, è predefinito a 1\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1318,7 +1336,7 @@ msgstr ""
 "definizioni,\n"
 "                              è predefinito a 0\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1328,8 +1346,8 @@ msgstr ""
 "messaggi\n"
 "                              unici vengono stampati\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1337,8 +1355,8 @@ msgstr ""
 "  -P, --properties-input      i file di input usano la sintassi Java ."
 "properties\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1348,12 +1366,12 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codifica dell'output\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1362,46 +1380,33 @@ msgstr ""
 "      --use-first             usa la prima traduzione disponibile per ogni\n"
 "                              messaggio, non unisce diverse traduzioni\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --color                 usa sempre colori e altri attributi\n"
-"      --color=QUANDO          usa colori e altri attributi solo QUANDO.\n"
-"                              QUANDO può essere 'always', 'never', 'auto', o "
-"'html'.\n"
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=FILESTILE       specifica il file di stile CSS per --color\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "non sono specificati file d'ingresso"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sono richiesti esattamente 2 file d'ingresso"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uso: %s [OPZIONE] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1419,23 +1424,23 @@ msgstr ""
 "programma. Quando non è possibile trovare una corrispondenza esatta, sono usate\n"
 "le corrispondenze approssimative (fuzzy) per produrre diagnostiche migliori.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduzioni\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     riferimenti alle fonti\n"
 
 # FIXME
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori di operazione:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1444,59 +1449,64 @@ msgstr ""
 "  -m, --multi-domain          applica ref.pot a ciascuno dei domini in def."
 "po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     non usa le corrispondenze fuzzy\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             considera le voci fuzzy\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      considera le voci non tradotte\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "questo messaggio non è tradotto"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "questo messaggio deve essere controllato dal traduttore"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "questo messaggio è usato ma non definito..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ma questa definizione è simile"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "questo messaggio è usato ma non è definito in %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "trovato %d errore fatale"
 msgstr[1] "trovati %d errori fatali"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "devono essere specificati almeno due file"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1516,7 +1526,7 @@ msgstr ""
 "commenti di estrazione saranno conservati, ma solo dal primo file PO che li\n"
 "definisce. Le posizioni nei file di tutti i file PO verranno accumulate.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1526,7 +1536,7 @@ msgstr ""
 "definizioni,\n"
 "                              è predefinito a 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1534,35 +1544,35 @@ msgstr ""
 "      --omit-header           non scrive l'intestazione con la voce 'msgid "
 "\"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converte un catalogo di traduzioni in una diversa codifica.\n"
 
 # FIXME
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Obiettivo di conversione:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "La codifica predefinita è la codifica della locale corrente.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                stile di output indentato\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           sopprime le righe \"#: nomefile:riga\"\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1570,29 +1580,29 @@ msgstr ""
 "      --add-location          preserva le righe \"#: nomefile:riga"
 "\" (predefinito)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                stile di output Uniforum strict\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "non è specificato nessun file d'ingresso"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "è richiesto esattamente un file d'ingresso"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uso: %s [OPZIONE] FILEINPUT\n"
 
 # FIXME
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1605,22 +1615,22 @@ msgstr ""
 "xgettext). Alle voci non tradotte è fornita una traduzione identica\n"
 "al msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FILEINPUT                   file PO o POT di input\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "nome di comando mancante"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] COMANDO [OPZIONE-COMANDO]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1635,7 +1645,7 @@ msgstr ""
 "diventa l'output di msgexec. Il codice di uscita di msgexec corrisponde al\n"
 "massimo codice di uscita in tutte le chiamate.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1644,43 +1654,43 @@ msgstr ""
 "Uno speciale comando interno chiamato \"0\" stampa la traduzione, seguita da\n"
 "un byte null. L'output di \"msgexec 0\" è valido come input per \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FILEINPUT       file PO di input\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "scrittura su standard output non riuscita"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrittura sul sottoprocesso %s non riuscita"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "nome di filtro mancante"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "deve essere specificato almeno uno script sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1689,18 +1699,18 @@ msgstr ""
 "Un FILTRO può essere qualunque programma che legge una traduzione dallo\n"
 "standard input e scrive una traduzione modificata sullo standard output.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     aggiunge SCRIPT ai comandi da eseguire\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1711,7 +1721,7 @@ msgstr ""
 "                              da eseguire\n"
 
 # FIXME
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1720,7 +1730,7 @@ msgstr ""
 "dei\n"
 "                              modelli\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1728,114 +1738,96 @@ msgstr ""
 "      --no-escape             non usa gli escape del C nell'output "
 "(predefinito)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                stile di output indentato\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           non modifica l'intestazione, non la filtra\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Non ancora implementato."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "impossibile impostare un I/O non bloccante per il sottoprocesso %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunicazione col sottoprocesso %s non riuscita"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "lettura dal sottoprocesso %s non riuscita"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "sottoprocesso %s terminato con codice d'uscita %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "l'argomento di %s deve essere un singolo carattere di punteggiatura"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "endianness non valida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s richiede una specificazione \"-d directory\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s richiede una specificazione \"-l locale\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s è valido solo con %s o %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s è valido solo con %s, %s o %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d messaggio tradotto"
 msgstr[1] "%d messaggi tradotti"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduzione fuzzy"
 msgstr[1] ", %d traduzioni fuzzy"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d messaggio non tradotto"
 msgstr[1] ", %d messaggi non tradotti"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 
 # FIXME
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catalogo binario di messaggi dalla descrizione di traduzioni "
 "testuali.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1844,17 +1836,17 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
 "Similmente per gli argomenti opzionali.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             file di input\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1863,7 +1855,7 @@ msgstr ""
 "  -j, --java                  modo Java: genera una classe Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1872,12 +1864,12 @@ msgstr ""
 "      --java2                 come --java, e assume Java2 (JDK 1.2 o "
 "superiore)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                modo C#: genera un file .NET .dll\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1886,42 +1878,42 @@ msgstr ""
 "      --csharp-resources      modo risorse C#: genera un file .NET ."
 "resources\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   modo Tcl: genera un file tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                abilita il modo Uniforum strict\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Se il file di output è -, l'output viene scritto sullo standard output.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Posizione del file di output in modo Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RISORSA      nome della risorsa\n"
 
 # FIXME
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1930,7 +1922,7 @@ msgstr ""
 "  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
 
 # FIXME
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1939,7 +1931,7 @@ msgstr ""
 "delle\n"
 "                              classi\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1951,12 +1943,12 @@ msgstr ""
 "della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
 "La classe viene scritta nella directory specificata.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Posizione del file di output in modo C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1966,7 +1958,7 @@ msgstr ""
 "dalla\n"
 "                              locale\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1975,18 +1967,18 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .dll viene scritto in una\n"
 "sottodirectory della directory indicata, il cui nome dipende dalla locale.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Posizione del file di output in modo Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                directory base dei cataloghi di messaggi .msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1995,12 +1987,12 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
 "directory indicata.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretazione del file di input:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2011,14 +2003,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          controlla le stringhe di formato dipendenti\n"
 "                              dal linguaggio\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2027,7 +2019,7 @@ msgstr ""
 "      --check-header          verifica l'esistenza e il contenuto\n"
 "                              dell'intestazione\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2037,7 +2029,7 @@ msgstr ""
 "dominio\n"
 "                              e l'opzione --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2046,7 +2038,7 @@ msgstr ""
 "  -C, --check-compatibility   controlla che GNU msgfmt si comporti come\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2056,12 +2048,12 @@ msgstr ""
 "      --check-accelerators[=CAR]  controlla la presenza degli acceleratori\n"
 "                                da tastiera per le voci di menù\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             usa le voci fuzzy nell'output\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2069,89 +2061,89 @@ msgstr ""
 "  -a, --alignment=NUMERO      allinea le stringhe a NUMERO byte\n"
 "                              (predefinito: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               non include la tabella hash nel file binario\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            stampa statistiche sulle traduzioni\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta il livello di prolissità\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "attenzione: intestazione del file PO mancante o non valida\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "attenzione: intestazione fuzzy del file PO\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "attenzione: versioni più vecchie di msgfmt generano un errore in questo "
 "caso\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
 "un prefisso"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direttiva \"domain %s\" ignorata"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" vuota"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" fuzzy"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2160,7 +2152,7 @@ msgstr ""
 "l'opzione \"%c\" non può essere usata prima di aver specificato \"J\", \"K"
 "\", \"T\", \"C\" o \"X\"."
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2169,7 +2161,7 @@ msgstr ""
 "Estrae tutti i messaggi di un catalogo di traduzioni che corrispondono a un\n"
 "modello indicato o appartengono a qualche file sorgente specificato.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2245,7 +2237,7 @@ msgstr ""
 "  -v, --invert-match          emette solo i messaggi che non corrispondono ad\n"
 "                              alcun criterio di selezione\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2254,20 +2246,20 @@ msgstr ""
 "carattere\n"
 "                              esteso\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera un output ordinato\n"
 
 # FIXME
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          ordina l'output in base alla posizione nel "
 "file\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2277,7 +2269,7 @@ msgstr ""
 "variabile d'ambiente LANG, come descritto nel file ABOUT-NLS. Questo\n"
 "è necessario per verificare le proprie traduzioni.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2288,12 +2280,12 @@ msgstr ""
 "Specificare la locale attraverso l'opzione --locale o\n"
 "il file .po di output attraverso l'opzione --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Creato %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2302,12 +2294,12 @@ msgstr ""
 "Crea un nuovo file PO, inizializzando le meta informazioni con valori\n"
 "dall'ambiente dell'utente.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FILEINPUT       file POT di input\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2318,12 +2310,12 @@ msgstr ""
 "directory\n"
 "corrente. Se è -, viene letto lo standard input.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      scrive output sul file PO specificato\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2333,12 +2325,12 @@ msgstr ""
 "dalle impostazioni della locale dell'utente. Se è -, i risultati vengono\n"
 "scritti sullo standard output.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          imposta la locale obiettivo\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2346,7 +2338,7 @@ msgstr ""
 "      --no-translator         assume che il file PO sia generato "
 "automaticamente\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2354,12 +2346,12 @@ msgstr ""
 "Più di un file .pot trovato.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "errore durante la lettura della directory corrente"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2367,15 +2359,15 @@ msgstr ""
 "Nessun file .pot trovato nella directory corrente.\n"
 "Specificare il file .pot di input con l'opzione --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "sottoprocesso %s non riuscito con codice d'uscita %d"
 
 # FIXME
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2392,23 +2384,23 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traduzioni italiane per il pacchetto %s."
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "il set di caratteri corrente \"%s\" non è un nome di codifica portabile"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "due diversi set di caratteri \"%s\" e \"%s\" nel file di input"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2416,7 +2408,7 @@ msgstr ""
 "l'intestazione del file di input \"%s\" non contiene una specificazione del "
 "set di caratteri"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2425,20 +2417,20 @@ msgstr ""
 "il dominio \"%s\" nel file di input \"%s\" non contiene un'intestazione con "
 "una specificazione del set di caratteri"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "il set di caratteri obiettivo \"%s\" non è un nome di codifica portabile"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2447,7 +2439,7 @@ msgstr ""
 "I file di input contengono messaggi in diverse codifiche, tra cui UTF-8.\n"
 "L'output viene convertito in UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2459,7 +2451,7 @@ msgstr ""
 "L'output viene convertito in UTF-8.\n"
 "Per scegliere una diversa codifica dell'output, usare l'opzione --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2472,7 +2464,7 @@ msgstr ""
 "Cambiare tutti i msgid e msgctxt in ASCII puro oppure assicurarsi che sono\n"
 "in codifica UTF-8 già nei file sorgenti.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2485,12 +2477,12 @@ msgstr ""
 "L'output di \"%s\" potrebbe essere incorretto.\n"
 "Possibili soluzioni sono:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Impostare LC_ALL a una locale con codifica %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2501,7 +2493,7 @@ msgstr ""
 "  applicare \"%s\",\n"
 "  poi convertire di nuovo in %s con \"msgconv\".\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2514,7 +2506,7 @@ msgstr ""
 "  applicare \"%s\",\n"
 "  poi convertire di nuovo in %s con \"msgconv\".\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2526,26 +2518,26 @@ msgstr ""
 "L'output di \"%s\" potrebbe essere incorretto.\n"
 "Una possibile soluzione è impostare LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "l'espressione plurale può produrre valori negativi"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ma l'espressione plurale può produrre valori fino a %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "l'espressione plurale può produrre una divisione per zero"
 
 # FIXME
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "l'espressione plurale può produrre un overflow dell'intero"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2553,51 +2545,51 @@ msgstr ""
 "l'espressione plurale può produrre una eccezione aritmetica, forse una "
 "divisione per zero"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Provare ad usare il seguente, valido per %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "il catalogo dei messaggi contiene traduzioni di forme plurali"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=ESPRESSIONE\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=INTERO\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "valore di nplurals non valido"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "espressione plurale non valida"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ma alcuni messaggi hanno solo una forma plurale"
 msgstr[1] "ma alcuni messaggi hanno solo %lu forme plurali"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "ma alcuni messaggi hanno una forma plurale"
 msgstr[1] "ma alcuni messaggi hanno %lu forme plurali"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2606,89 +2598,90 @@ msgstr ""
 "l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; "
 "plural=ESPRESSIONE;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "le voci \"msgid\" e \"msgid_plural\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr[%u]\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "le voci \"msgid\" e \"msgid_plural\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr[%u]\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "la gestione del plurale è un'estensione di GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "in msgstr manca il carattere \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "in msgstr ci sono troppi caratteri \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "campo \"%s\" mancante nell'intestazione\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 "il campo \"%s\" dell'intestazione dovrebbe cominciare all'inizio della riga\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "alcuni campi dell'intestazione sono ancora al valore iniziale predefinito\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "il campo \"%s\" ha ancora il valore iniziale predefinito\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"alcuni campi dell'intestazione sono ancora al valore iniziale predefinito\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input non valido nella codifica \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "il file di input non contiene un'intestazione con una specificazione del set "
 "di caratteri"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2697,7 +2690,7 @@ msgstr ""
 "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(), e iconv() "
 "non gestisce questa conversione."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2707,8 +2700,8 @@ msgstr ""
 "diventano\n"
 "uguali."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2717,17 +2710,17 @@ msgstr ""
 "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(). Questa "
 "versione è stata compilata senza iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s è valido solamente con %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipo di backup"
 
 # FIXME UPSTREAM
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2752,19 +2745,19 @@ msgstr ""
 "Quando è impossibile trovare una corrispondenza esatta, una corrispondenza\n"
 "approssimativa (fuzzy) è usata per ottenere i migliori risultati.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      traduzioni che si riferiscono alle vecchie "
 "fonti\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     riferimenti alle nuove fonti\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2774,7 +2767,7 @@ msgstr ""
 "messaggi,\n"
 "                              può essere specificata più di una volta\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2783,28 +2776,28 @@ msgstr ""
 "  -U, --update                aggiorna il file def.po,\n"
 "                              non fa niente se def.po è già aggiornato\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Posizione del file di output in modalità di aggiornamento:\n"
 
 # FIXME
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Il risultato è riscritto in def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROLLO      fa il backup di def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFISSO       cambia il solito suffisso dei backup\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2823,7 +2816,7 @@ msgstr ""
 "  existing, nil   numerati se esistono backup numerati, altrimenti semplici\n"
 "  simple, never   fa sempre backup semplici\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2833,12 +2826,7 @@ msgstr ""
 "Il suffisso dei backup è \"~\", a meno che sia impostato con --suffix o la\n"
 "variabile d'ambiente SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     non usa le corrispondenze fuzzy\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2846,22 +2834,22 @@ msgstr ""
 "      --previous              mantiene i precedenti msgid dei messaggi "
 "tradotti\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       sopprime gli indicatori di avanzamento\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "questo messaggio dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "questo messaggio non dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2870,27 +2858,29 @@ msgstr ""
 "%sLetti %ld vecchi + %ld riferimenti, fusi %ld, fuzzy %ld, persi %ld, "
 "obsoleti %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " fatto.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e i nomi di file espliciti sono mutuamente esclusivi"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILE]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Converte un catalogo binario di messaggi in un file .po in stile Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2900,12 +2890,12 @@ msgstr ""
 "ResourceBundle\n"
 "                              di Java\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                modo C#: l'input è un file .NET .dll\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2914,24 +2904,24 @@ msgstr ""
 "      --csharp-resources      modo risorse C#: l'input è un file .NET ."
 "resources\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   modo Tcl: l'input è un file tcl/msgcat .msg\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    file .mo di input\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Posizione del file di input in modo Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2942,12 +2932,12 @@ msgstr ""
 "della risorsa, separata da una sottolineatura. La classe viene localizzata\n"
 "con CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Posizione del file di input in modo C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2956,12 +2946,12 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .dll si trova in una\n"
 "sottodirectory della directory indicata, il cui nome dipende dalla locale.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Posizione del file di input in modo Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2970,18 +2960,18 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg si trova della directory\n"
 "indicata.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                scrive con stile di output indentato\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                scrive in stile Uniforum strict\n"
 
 # FIXME UPSTREAM
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3004,12 +2994,12 @@ msgstr ""
 "traduzione. Le posizioni dei file vengono accumulate. Quando si usa l'opzione\n"
 "--unique, i duplicati vengono scartati.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              stampa solo i duplicati\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3018,7 +3008,7 @@ msgstr ""
 "  -u, --unique                stampa solo i messaggi unici, scarta i "
 "duplicati\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<standard input>"
@@ -3107,65 +3097,65 @@ msgstr "la prima forma plurale ha indice diverso da zero"
 msgid "plural form has wrong index"
 msgstr "la forma plurale ha indice non corretto"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "troppi errori, interrotto"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequenza multibyte non valida"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequenza multibyte non valida alla fine del file"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequenza multibyte non valida a fine riga"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "errore in iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "la parola chiave \"%s\" è sconosciuta"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "sequenza di controllo non valida"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file all'interno di una stringa"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line all'interno di una stringa"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separatore di contesto <EOT> all'interno di una stringa"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definizione del messaggio duplicata"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "questa è la posizione della prima definizione"
 
@@ -3250,17 +3240,17 @@ msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "attesi due argomenti"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uso: %s [OPZIONE] URL FILE\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3269,11 +3259,26 @@ msgstr ""
 "Scarica e mostra i contenuti di un URL. Se non è possibile accedere all'URL,\n"
 "viene usato il FILE locale al suo posto.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "errore durante la scrittura su standard output"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3318,43 +3323,43 @@ msgstr ""
 "formato\n"
 "di output non le gestisce."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossibile creare il file di output \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standard output"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "creazione della directory \"%s\" non riuscita"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "compilazione della classe C# non riuscita, provare --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "compilazione della classe C# non riuscita"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nome di classe Java non valido: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilazione della classe Java non riuscita, provare --verbose o impostare "
 "$JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3365,7 +3370,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "errore durante l'apertura di \"%s\" in scrittura"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3373,7 +3378,7 @@ msgstr ""
 "i messaggi internazionalizzati non devono contenere la sequenza di escape "
 "\"\\%c\""
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3386,7 +3391,7 @@ msgstr ""
 "diversa dalla propria. Considerare l'uso di un msgctxt in puro ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3410,13 +3415,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"il catalogo dei messaggi contiene stringhe msgctxt con caratteri non in ISO-"
-"8859-1,\n"
+"il catalogo dei messaggi contiene stringhe msgctxt con caratteri non in "
+"ISO-8859-1,\n"
 "ma il formato dei cataloghi Qt gestisce Unicode solo nelle stringhe "
 "tradotte,\n"
 "non nelle stringhe di contesto\n"
@@ -3427,8 +3432,8 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"il catalogo dei messaggi contiene stringhe msgid con caratteri non in ISO-"
-"8859-1,\n"
+"il catalogo dei messaggi contiene stringhe msgid con caratteri non in "
+"ISO-8859-1,\n"
 "ma il formato dei cataloghi Qt gestisce Unicode solo nelle stringhe "
 "tradotte,\n"
 "non in quelle originali\n"
@@ -3438,7 +3443,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "errore durante la scrittura sul sottoprocesso %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3446,7 +3451,7 @@ msgstr ""
 "il catalogo dei messaggi contiene traduzioni dipendenti dal contesto,\n"
 "ma il formato delle risorse C# non le gestisce.\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3472,36 +3477,34 @@ msgstr ""
 "formato\n"
 "dei cataloghi Tcl non le gestisce.\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: attenzione: stringa non terminata"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: attenzione: espressione regolare non terminata"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attenzione: costante carattere non terminata"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Stringa non ASCII in %s%s.\n"
 "Specificare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3510,7 +3513,7 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3519,7 +3522,7 @@ msgstr ""
 "%s:%d: sequenza multibyte lunga incompleta.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3528,7 +3531,7 @@ msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine del file.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3537,12 +3540,12 @@ msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv non riuscita"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3551,32 +3554,32 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: attenzione: carattere Unicode non valido"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: attenzione: trovata \")\" dove era prevista \"}\""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3586,51 +3589,50 @@ msgstr ""
 "Questa versione è stata compilata senza expat.\n"
 
 # FIXME
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: attenzione: lone surrogate U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: impossibile trovare il terminatore di stringa \"%s\" prima di EOF"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \"}\" mancante in \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazione non valida (\"\\l\") del carattere a 8bit \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazione non valida (\"\\u\") del carattere a 8bit \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolazione variabile non valida in \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazione non valida (\"\\L\") del carattere a 8bit \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazione non valida (\"\\U\") del carattere a 8bit \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3638,7 +3640,7 @@ msgstr ""
 "Indicare la codifica del sorgente usando --from-code o con un commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3650,7 +3652,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3662,7 +3664,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3674,7 +3676,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3686,7 +3688,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3697,27 +3699,27 @@ msgstr ""
 "Indicare la codifica del sorgente usando --from-code o con un commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codifica \"%s\" sconosciuta. Si continua con ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definizione stringa non valida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: numero mancante dopo #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: espressione stringa non valida"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3726,30 +3728,30 @@ msgstr ""
 "%s:%lu: attenzione: la sintassi $\"...\" è deprecata per motivi di "
 "sicurezza; usare eval_gettext al suo posto"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing non può essere usato quando l'output è scritto su standard "
 "output"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non può operare senza parole chiavi da ricercare"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "attenzione: il file \"%s\" ha estensione \"%s\" sconosciuta: si prova con C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Estrae le stringhe traducibili dai file di input indicati.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3758,12 +3760,12 @@ msgstr ""
 "  -d, --default-domain=NOME   usa NOME.po per l'output (invece di messages."
 "po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           scrive l'output sul file indicato\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3771,12 +3773,12 @@ msgstr ""
 "  -p, --output-dir=DIR        i file di output saranno posizionati nella\n"
 "                              directory DIR\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Scelta del linguaggio del file di input:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3795,12 +3797,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3809,7 +3811,7 @@ msgstr ""
 "Come impostazione predefinita, la scelta del linguaggio si basa "
 "sull'estensione del file di input.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3818,44 +3820,47 @@ msgstr ""
 "      --from-code=NOME        codifica dei file di input\n"
 "                                (ad eccezione di Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Come impostazione predefinita, i file di input si considerano ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         unisce i messaggi con il file esistente\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  non estrae le voci in FILE.po\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=TAG]    mette il blocco di commenti che contiene TAG\n"
 "                              (o le righe di parole chiave che le "
 "precedono)\n"
 "                              nel file di output \n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opzioni di linguaggio specifiche:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3868,18 +3873,18 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=PAROLA]      parola chiave aggiuntiva da cercare (senza "
 "PAROLA\n"
 "                              indica di non usare le parole chiave "
 "predefinite)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3890,7 +3895,7 @@ msgstr ""
 "nell'argomento\n"
 "                              numero ARG della parola chiave PAROLA\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3903,37 +3908,37 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             riconosce i trigrammi ANSI C in input\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo linguaggio C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3942,12 +3947,12 @@ msgstr ""
 "del\n"
 "                              riconoscimento della stringa di formato\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrive un file .properties Java\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -3955,7 +3960,7 @@ msgstr ""
 "output\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3963,20 +3968,20 @@ msgstr ""
 "      --foreign-user          omette dall'output il copyright della FSF per\n"
 "                              gli utenti non GNU\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=NOME     imposta il nome del pacchetto in output\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSIONE imposta la versione del pacchetto in "
 "output\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3985,44 +3990,61 @@ msgstr ""
 "segnalare\n"
 "                              errori nelle voci msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=STRINGA] usa STRINGA o \"\" come prefisso delle voci "
 "msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=STRINGA] usa STRINGA o \"\" come suffisso delle voci "
 "msgstr\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Un argomento di --flag non usa la sintassi <parolachiave>:<num-arg>:[pass-]"
 "[flag]: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: attenzione: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4031,17 +4053,17 @@ msgstr ""
 "Sebbene usata dove dovrebbe esserci una stringa di formato, %s non è una "
 "stringa di formato %s valida. Motivo: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Sebbene dichiarata come tale, %s non è una stringa di formato %s valida. "
 "Motivo: %s\n"
 
 # FIXME
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4055,7 +4077,7 @@ msgstr ""
 "Considerare l'uso di una stringa di formato con argomenti con nome,\n"
 "e di una mappatura invece di una tupla per gli argomenti.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4065,29 +4087,29 @@ msgstr ""
 "gettext(\"\") restituisce l'intestazione con\n"
 "le metainformazioni, non la stringa vuota.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "attenzione: contesto mancante per l'argomento plurale della parola chiave "
 "\"%.*s\""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "differenza di contesto tra la forma singolare e la forma plurale"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4099,7 +4121,7 @@ msgstr ""
 "variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
 "l'opzione --msgid-bugs-address da riga di comando.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "linguaggio \"%s\" sconosciuto"
@@ -4108,6 +4130,30 @@ msgstr "linguaggio \"%s\" sconosciuto"
 msgid "<unnamed>"
 msgstr "<senza nome>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illecita -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle fallito con codice di errore 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Non ancora implementato."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "impossibile impostare un I/O non bloccante per il sottoprocesso %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "comunicazione col sottoprocesso %s non riuscita"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "lettura dal sottoprocesso %s non riuscita"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "sottoprocesso %s terminato con codice d'uscita %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "il campo \"%s\" ha ancora il valore iniziale predefinito\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Riferimenti multipli a %%%c."
 

diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index aedf8869a8a21e993835f70713800324c8ccbd57..ddfc1f831fe2744ed47a9c85e71beef5651a3147 100644 (file)
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-10 22:38+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -32,22 +32,22 @@ msgstr "%2$s 
 msgid "Valid arguments are:"
 msgstr "Àµ¤·¤¤°ú¿ô:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤ò¸«ÉÕ¤±¤é¤ì¤Þ¤»¤ó. $TMPDIR ¤òÀßÄꤷ¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "¥Æ¥ó¥×¥ì¡¼¥È \"%s\" ¤ò»È¤Ã¤Æ°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë \"%s\" ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "°ì»þ¥Ç¥£¥ì¥¯¥È¥ê %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó"
@@ -56,10 +56,10 @@ msgstr "
 msgid "write error"
 msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -85,8 +85,8 @@ msgstr "\"%s\" 
 msgid "error after reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ó¤À¸å¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -103,74 +103,73 @@ msgstr "C# 
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. pnet ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "̤ÃΤΥ·¥¹¥Æ¥à¥¨¥é¡¼"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ïǧ¼±¤µ¤ì¤Þ¤»¤ó\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: °ú¿ô¤¬É¬Íפʥª¥×¥·¥ç¥ó -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -182,14 +181,14 @@ msgstr "compile_java_class 
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class ¤ËÂФ¹¤ë̵¸ú¤Ê target_version °ú¿ô"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -209,8 +208,8 @@ msgstr ""
 "Java ²¾ÁÛ¥Þ¥·¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó. gij ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤« $JAVA ¤òÀßÄꤷ¤Æ¤¯"
 "¤À¤µ¤¤"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹Æþ½ÐÎÏ¥¨¥é¡¼"
@@ -222,8 +221,8 @@ msgstr "%s 
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "¥Ñ¥¤¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
@@ -283,7 +282,7 @@ msgstr "'%s' 
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -292,7 +291,7 @@ msgstr "
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -300,7 +299,7 @@ msgstr "
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -695,11 +694,11 @@ msgid ""
 "1 and 9."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Î½ªÃ¼Ê¸»ú¤Ï 1 ¤«¤é 9 ¤Î´Ö¤Î¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -716,38 +715,38 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¡¦¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¤Î¤ÇÊѹ¹¤ÈºÆÇÛÉۤϼ«Í³¤Ç¤¹.\n"
 "¤¿¤À¤·Ë¡Î§¤¬µö¤¹ÈϰϤÇ̵ÊݾڤǤ¹.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ºî¼Ô %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï `%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]\n"
@@ -783,29 +782,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ¥Û¥¹¥È̾¤ËÂФ¹¤ë¥¢¥É¥ì¥¹\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "¾ðÊó½ÐÎÏ:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
@@ -814,11 +813,11 @@ msgstr "  -V, --version               
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-gnu-gettext@gnu.org> ¤Þ¤Ç.\n"
 
@@ -827,93 +826,93 @@ msgstr "
 msgid "could not get host name"
 msgstr "¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ºÇÂç 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬µö¤µ¤ì¤Þ¤¹"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "°À­¤Ë½¾¤Ã¤ÆËÝÌõ¥«¥¿¥í¥°¤Î¥á¥Ã¥»¡¼¥¸¤òÁªÊ̤·, °À­¤ò¤¦¤Þ¤¯Áàºî¤·¤Þ¤¹.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ÆþÎÏ PO ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥ê¥¹¥È¤Ë DIRECTORY ¤òÄɲÃ\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -922,19 +921,19 @@ msgstr ""
 "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ"
 "¤¹.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ÁªÂò:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            ËÝÌõ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò»Ä¤·, ̤ËÝÌõ¤òºï½ü\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -942,53 +941,53 @@ msgstr ""
 "      --untranslated          ̤ËÝÌõ¤Î¥á¥Ã¥»¡¼¥¸¤ò»Ä¤·, ËÝÌõ¤µ¤ì¤¿¤â¤Î¤òºï"
 "½ü\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' ¥Þ¡¼¥¯ÉÕ¤­¤Î¥á¥Ã¥»¡¼¥¸¤òºï½ü\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' ¥Þ¡¼¥¯ÉÕ¤­¤Î¥á¥Ã¥»¡¼¥¸¤ò»Ä¤¹\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤òºï½ü\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         ÇѤ줿 #~ ¥á¥Ã¥»¡¼¥¸¤ò»Ä¤¹\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "°À­Áàºî:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'fuzzy' ¤ËÀßÄê\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'Èó fuzzy' ¤ËÀßÄê\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò 'ÇѤ줿' ¾õÂÖ¤ËÀßÄê\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤òÈó 'ÇѤ줿' ¾õÂÖ¤ËÀßÄê\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -996,47 +995,47 @@ msgid ""
 msgstr ""
 "      --clear-previous        Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤«¤é \"Á°¤Î msgid\" ¤òºï½ü\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     FILE.po ¤Ë¤¢¤ë¥¨¥ó¥È¥ê¤Î¤ß½èÍý\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=FILE.po   FILE.po ¤Ë¤Ê¤¤¥¨¥ó¥È¥ê¤Î¤ß½èÍý\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ¤ÈƱ¤¸\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete ¤ÈƱ¤¸\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Îʸˡ:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï Java .properties ¤Îʸˡ\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1045,26 +1044,49 @@ msgstr ""
 "      --stringtable-input     ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï NeXTstep/GNUstep .strings ¤Îʸ"
 "ˡ\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "½ÐÎϤξܺÙ:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 ¾ï¤Ë¥«¥é¡¼¤È¾¤Î¥Æ¥­¥¹¥È°À­¤ò»È¤¦\n"
+"      --color=WHEN            WHEN ¤Ê¤é¤Ð¥«¥é¡¼¤È¾¤Î¥Æ¥­¥¹¥È°À­¤ò»È¤¦.\n"
+"                              WHEN ¤Ï 'always', 'never', 'auto', ¤Þ¤¿¤Ï "
+"'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=STYLEFILE       --color ¤ËÂФ¹¤ë CSS ¥¹¥¿¥¤¥ë¥ë¡¼¥ë¤ò»ØÄê\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤ï¤Ê¤¤ (ɸ½à)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1072,68 +1094,68 @@ msgstr ""
 "  -E, --escape                ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤¤,\n"
 "                              ³Èĥʸ»ú¤ò´Þ¤á¤Ê¤¤\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ¶õ¤Ç¤¢¤Ã¤Æ¤â PO ¥Õ¥¡¥¤¥ë¤ò½ñ¤­½Ð¤¹\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Ç .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤ò½ñ¤­½Ð¤µ¤Ê¤¤\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤òÀ¸À® (ɸ½à)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                ¸·Ì©¤Ê Uniforum ·Á¼°¤Î .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    NeXTstep/GNUstep .strings ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1142,26 +1164,26 @@ msgstr ""
 "      --no-wrap               ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤è¤êŤ¤¥á¥Ã¥»¡¼¥¸¹Ô¤ò²þ¹Ô¤·¤Ê"
 "¤¤\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n"
@@ -1189,23 +1211,23 @@ msgstr ""
 "¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ\n"
 "¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò FILE ¤«¤é¼èÆÀ\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1223,7 +1245,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ¤è¤ê¿¤¯ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎÏ\n"
 "                              ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç 0\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1232,15 +1254,15 @@ msgstr ""
 "  -u, --unique                --less-than=2 ¤Îû½Ì·Á. 1¤Ä¤·¤«¤Ê¤¤¥á¥Ã¥»¡¼¥¸\n"
 "                              ¤Î¤ß¤òɽ¼¨\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï Java .properties ¤Îʸˡ\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1249,12 +1271,12 @@ msgstr ""
 "      --stringtable-input     ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï NeXTstep/GNUstep .strings ¤Îʸ"
 "ˡ\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          ½ÐÎϤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1263,47 +1285,28 @@ msgstr ""
 "      --use-first             ³Æ¡¹¤Î¥á¥Ã¥»¡¼¥¸¤ÎºÇ½é¤ËÍ­¸ú¤ÊËÝÌõ¤ò»È¤¦\n"
 "                              Ê£¿ô¤ÎËÝÌõ¤ò¥Þ¡¼¥¸¤·¤Ê¤¤\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 ¾ï¤Ë¥«¥é¡¼¤È¾¤Î¥Æ¥­¥¹¥È°À­¤ò»È¤¦\n"
-"      --color=WHEN            WHEN ¤Ê¤é¤Ð¥«¥é¡¼¤È¾¤Î¥Æ¥­¥¹¥È°À­¤ò»È¤¦.\n"
-"                              WHEN ¤Ï 'always', 'never', 'auto', ¤Þ¤¿¤Ï "
-"'html'.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=STYLEFILE       --color ¤ËÂФ¹¤ë CSS ¥¹¥¿¥¤¥ë¥ë¡¼¥ë¤ò»ØÄê\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Àµ³Î¤Ë 2¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] def.po ref.pot\n"
@@ -1336,12 +1339,12 @@ msgstr "  def.po                      
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ¥½¡¼¥¹¤Ø¤Î»²¾È\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Áàºî»ØÄê:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1349,7 +1352,7 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ref.pot ¤ò def.po Æâ¤Î¥É¥á¥¤¥ó¤Î³Æ¡¹¤ËŬÍÑ\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ¤¢¤¤¤Þ¤¤¸¡º÷¤ò¹Ô¤ï¤Ê¤¤\n"
@@ -1374,17 +1377,17 @@ msgstr "
 msgid "this message needs to be reviewed by the translator"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏËÝÌõ¼Ô¤Ë¤è¤ë¥ì¥Ó¥å¡¼¤¬É¬ÍפǤ¹"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...¤·¤«¤·¤³¤ÎÄêµÁ¤¬»÷¤Æ¤¤¤Þ¤¹"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ %s ¤Ç¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1400,12 +1403,12 @@ msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "¾¯¤Ê¤¯¤È¤â 2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1425,7 +1428,7 @@ msgstr ""
 "¥³¥á¥ó¥È¤Ï, ¤½¤ì¤é¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤Î¤ß¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 "¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1434,68 +1437,68 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ¤è¤ê¿¤¯ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎÏ\n"
 "                              ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           `msgid \"\"' ¤ò´Þ¤ó¤À¥Ø¥Ã¥À¤ò½ÐÎϤ·¤Ê¤¤\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "ËÝÌõ¥«¥¿¥í¥°¤ò°Û¤Ê¤Ã¤¿Ê¸»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "ÊÑ´¹ÂоÝ:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ɸ½à¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¸½ºß¤Î¥í¡¼¥«¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Î½ÐÎÏ\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           '#: filename:line' ¤Î¹Ô¤ò½ÐÎϤ·¤Ê¤¤\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          '#: filename:line' ¤Î¹Ô¤òÊÝ»ý (ɸ½à)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ½ÐÎÏ·Á¼°\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "Àµ³Î¤Ë 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] INPUTFILE\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1507,7 +1510,7 @@ msgstr ""
 "PO ¥Æ¥ó¥×¥ì¡¼¥È¥Õ¥¡¥¤¥ë (°ìÈÌ¤Ë xgettext ¤Ë¤è¤Ã¤ÆÀ¸À®) ¤Ç¤¹. ̤ËÝÌõ¤Î¥¨¥ó¥È¥ê\n"
 "¤Ï msgid ¤ÈƱ¤¸ËÝÌõ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ÆþÎϤ¹¤ë PO ¤Þ¤¿¤Ï POT ¥Õ¥¡¥¤¥ë\n"
@@ -1546,7 +1549,7 @@ msgstr ""
 "'0' ¤È¤¤¤¦ÆÃÊ̤ÊÁȤ߹þ¤ß¥³¥Þ¥ó¥É¤ÏºÇ¸å¤Ë¥Ì¥ëʸ»ú¤òÉÕ¤±¤ÆËÝÌõ¤ò½ÐÎϤ·¤Þ¤¹.\n"
 "\"msgexec 0\" ¤Î½ÐÎÏ¤Ï \"xargs -0\" ¤Ø¤ÎÆþÎϤËŬ¤·¤Æ¤¤¤Þ¤¹.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ÆþÎϤ¹¤ë PO ¥Õ¥¡¥¤¥ë\n"
@@ -1561,27 +1564,27 @@ msgstr "ɸ
 msgid "write to %s subprocess failed"
 msgstr "%s ¤Ø½ñ¤­½Ð¤¹¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "¥Õ¥£¥ë¥¿Ì¾¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "¾¯¤Ê¤¯¤È¤â 1¤Ä¤Î sed ¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] ¥Õ¥£¥ë¥¿ [¥Õ¥£¥ë¥¿¥ª¥×¥·¥ç¥ó]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "ËÝÌõ¥«¥¿¥í¥°¤ÎÁ´¤Æ¤ÎËÝÌõ¤Ë¥Õ¥£¥ë¥¿¤òŬÍÑ.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1591,18 +1594,18 @@ msgstr ""
 "¤¹\n"
 "Ǥ°Õ¤Î¥×¥í¥°¥é¥à¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "FILTER ¤¬ 'sed' ¤Î¾ì¹ç¤ËÊØÍø¤Ê FILTER-OPTION:\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     ¼Â¹Ô¤µ¤ì¤ë¥³¥Þ¥ó¥É¤Ë SCRIPT ¤òÄɲÃ\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1611,25 +1614,25 @@ msgid ""
 msgstr ""
 "  -f, --file=SCRIPTFILE       SCRIPTFILE ¤ÎÆâÍƤò¼Â¹Ô¤µ¤ì¤ë¥³¥Þ¥ó¥É¤ËÄɲÃ\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       ¥Ñ¥¿¡¼¥ó¥¹¥Ú¡¼¥¹¤Î¼«Æ°Åª¤Êɽ¼¨¤òÍÞÀ©\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤ï¤Ê¤¤ (ɸ½à)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                »ú²¼¤²·Á¼°¤Î½ÐÎÏ\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1646,22 +1649,22 @@ msgid "invalid endianness: %s"
 msgstr "̵¸ú¤Ê¥¨¥ó¥Ç¥£¥¢¥ó: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ¤Ë¤Ï \"-d ¥Ç¥£¥ì¥¯¥È¥ê\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s ¤Ë¤Ï \"-l ¥í¥«¡¼¥ë\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ¤Ï %s ¤Þ¤¿¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹"
@@ -1706,7 +1709,7 @@ msgstr "
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò¸¶Ê¸¤ÎËÝÌõ¤Îµ­½Ò¤«¤éÀ¸À®.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1720,7 +1723,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Áàºî¥â¡¼¥É:\n"
@@ -1772,7 +1775,7 @@ msgstr "      --qt                    Qt 
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ¥â¡¼¥É¤òÍ­¸ú¤Ë\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
@@ -1782,13 +1785,13 @@ msgstr "
 msgid "Output file location in Java mode:\n"
 msgstr "Java ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     ¥ê¥½¡¼¥¹Ì¾\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1822,7 +1825,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "C# ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1845,7 +1848,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1860,7 +1863,7 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­\n"
 "½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î²ò¼á:\n"
@@ -1939,7 +1942,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ËÝÌõ¤Ë´Ø¤¹¤ëÅý·×¾ðÊó¤òɽ¼¨\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n"
@@ -1995,7 +1998,7 @@ msgstr "
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2006,7 +2009,7 @@ msgstr "%s: 
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2015,7 +2018,7 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó '%c' ¤Ï 'J' ¤ä 'K' ¤ä 'T' ¤ä 'C' ¤ä 'X' ¤¬»ØÄꤵ¤ì¤ëÁ°¤Ë»È¤¦¤³¤È¤Ï"
 "¤Ç¤­¤Þ¤»¤ó"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2024,7 +2027,7 @@ msgstr ""
 "ËÝÌõ¥«¥¿¥í¥°¤ÎÃ椫¤é, »ØÄꤵ¤ì¤¿¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë, ¤â¤·¤¯¤Ï»ØÄꤵ¤ì¤¿¤¤¤¯¤Ä\n"
 "¤«¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ëÁ´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2099,7 +2102,7 @@ msgstr ""
 "  -i, --ignore-case           Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤\n"
 "  -v, --invert-match          ¤É¤ÎÁªÂò´ð½à¤Ë¤â°ìÃפ·¤Ê¤¤¥á¥Ã¥»¡¼¥¸¤Î¤ß¤ò½ÐÎÏ\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2107,17 +2110,17 @@ msgstr ""
 "      --escape                ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤¤,\n"
 "                              ³Èĥʸ»ú¤ò´Þ¤á¤Ê¤¤\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2126,7 +2129,7 @@ msgstr ""
 "¤¢¤Ê¤¿¤Ï¸À¸ì¤Ë´Ø¤ï¤ê¤Î¤Ê¤¤´Ä¶­¤Ë¤¤¤Þ¤¹. ABOUT-NLS ¤Ëµ­½Ò¤µ¤ì¤¿¤è¤¦¤Ë\n"
 "´Ä¶­ÊÑ¿ô LANG ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤. ¤³¤ì¤ÇËÝÌõ¤ò¥Æ¥¹¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2137,24 +2140,24 @@ msgstr ""
 "--locale ¥ª¥×¥·¥ç¥ó¤Ç¥í¥«¡¼¥ë¤ò»ØÄꤹ¤ë¤«, --output-file ¥ª¥×¥·¥ç¥ó¤Ç\n"
 "½ÐÎϤ¹¤ë .po ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s ¤òÀ¸À®.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "¿·¤·¤¤ PO ¥Õ¥¡¥¤¥ë¤òºîÀ®. ¥æ¡¼¥¶´Ä¶­¤«¤é¤ÎÃͤǥ᥿¾ðÊó¤ò½é´ü²½¤·¤Þ¤¹.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       ÆþÎϤ¹¤ë POT ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2164,12 +2167,12 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ç POT ¥Õ¥¡¥¤¥ë¤¬¸¡º÷\n"
 "¤µ¤ì¤Þ¤¹. ¤â¤·ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Ê¤é¤Ðɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      »ØÄꤵ¤ì¤¿ PO ¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2179,18 +2182,18 @@ msgstr ""
 "¤Î\n"
 "¥í¥«¡¼¥ëÀßÄê¤Ë°Í¸¤·¤Þ¤¹. ¤â¤· - ¤Ê¤é¤Ð·ë²Ì¤Ïɸ½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          ÂоݤȤʤë¥í¥«¡¼¥ë¤òÀßÄê\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         PO ¥Õ¥¡¥¤¥ë¤¬¼«Æ°À¸À®¤µ¤ì¤ë¤È²¾Äê\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2198,12 +2201,12 @@ msgstr ""
 "1¤Ä°Ê¾å¤Î .pot ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤Þ¤·¤¿.\n"
 "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆɤ߹þ¤ß¥¨¥é¡¼"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2211,14 +2214,14 @@ msgstr ""
 "¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë .pot ¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿.\n"
 "--input ¥ª¥×¥·¥ç¥ó¤ÇÆþÎϤ¹¤ë .pot ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¼ºÇÔ, ½ªÎ»¥³¡¼¥É %d"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2235,7 +2238,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ"
@@ -2273,7 +2276,7 @@ msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "·Ù¹ð: "
@@ -2522,7 +2525,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2541,7 +2544,7 @@ msgstr ""
 "¤Þ¤¹."
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2550,16 +2553,16 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹.¤³¤Î¥Ð¡¼"
 "¥¸¥ç¥ó¤Ï iconv() ¤Ê¤·¤Çºî¤é¤ì¤Æ¤¤¤Þ¤¹."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¥¿¥¤¥×"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2581,17 +2584,17 @@ msgstr ""
 "»Ä¤µ¤ì¤Þ¤¹. Àµ³Î¤Ë°ìÃפ·¤Æ¤¤¤ë¸Ä½ê¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï, ¤¢¤¤¤Þ¤¤ (fuzzy)\n"
 "¸¡º÷¤ò»È¤¦¤È¤è¤êÎɤ¤·ë²Ì¤òÀ¸¤à¤Ç¤·¤ç¤¦. \n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      ¸Å¤¤¥½¡¼¥¹¤ËÂФ¹¤ë»²¾ÈËÝÌõ\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ¿·¤·¤¤¥½¡¼¥¹¤ËÂФ¹¤ë»²¾È\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2600,7 +2603,7 @@ msgstr ""
 "  -C, --compendium=FILE       ¥á¥Ã¥»¡¼¥¸ËÝÌõ¤ÎÄɲÃʸ¸¥\n"
 "                              1²ó°Ê¾å»ØÄꤵ¤ì¤ë²ÄǽÀ­¤¢¤ê\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2609,27 +2612,27 @@ msgstr ""
 "  -U, --update                def.po ¤ò¹¹¿·\n"
 "                              def.po ¤¬´û¤ËºÇ¿·ÈǤǤ¢¤ì¤Ð²¿¤â¤·¤Ê¤¤\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "¹¹¿·¥â¡¼¥É¤Ç¤Î½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "·ë²Ì¤Ï def.po ¤Ë½ñ¤­Ìᤵ¤ì¤Þ¤¹.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        def.po ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         Ä̾ï¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤ò¾å½ñ¤­\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2649,7 +2652,7 @@ msgstr ""
 "¼°\n"
 "  simple, never   ¾ï¤Ëñ½ã·Á¼°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2659,29 +2662,29 @@ msgstr ""
 "--suffix ¤ä´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð,\n"
 "¥Ð¥Ã¥¯¥¢¥Ã¥×ÀÜÈø¼­¤Ï `~' ¤Ç¤¹.\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              ËÝÌõ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎÁ°¤Î msgid ¤ò»Ä¤¹\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       ¿Ê¹Ô¾õ¶·¤òɽ¼¨¤·¤Ê¤¤\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤¹"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÊ£¿ô·Á¤òÄêµÁ¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2690,28 +2693,28 @@ msgstr ""
 "%s %ld(Á°¤ÎÈÇ) + %ld(¿·ÈÇ) ¤òÆɤ߹þ¤ß (¥Þ¡¼¥¸ %ld, ¤¢¤¤¤Þ¤¤ %ld, ·çÍî %ld, ÇË"
 "´þ %ld).\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " ´°Î».\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ¤ÈÌÀ¼¨Åª¤Ë»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤ÏÇØÈ¿¤Ç¤¹"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò Uniforum ·Á¼°¤Î .po ¥Õ¥¡¥¤¥ë¤ËÊÑ´¹.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2720,12 +2723,12 @@ msgstr ""
 "  -j, --java                  Java ¥â¡¼¥É: ÆþÎÏ¤Ï Java ResourceBundle ¥¯¥é"
 "¥¹\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# ¥â¡¼¥É: ÆþÎÏ¤Ï .NET .dll ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2734,24 +2737,24 @@ msgstr ""
 "      --csharp-resources      C# resources ¥â¡¼¥É: ÆþÎÏ¤Ï .NET .resources "
 "¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl ¥â¡¼¥É: ÆþÎÏ¤Ï tcl/msgcat .msg ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    ÆþÎϤ¹¤ë .mo ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java ¥â¡¼¥É¤Ë¤ª¤±¤ëÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2762,12 +2765,12 @@ msgstr ""
 "¤È\n"
 "¤Ç·è¤á¤é¤ì¤Þ¤¹. ¥¯¥é¥¹¤Î¾ì½ê¤Ï CLASSPATH ¤Ç»ØÄꤵ¤ì¤Þ¤¹.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# ¥â¡¼¥É¤Ë¤ª¤±¤ëÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2776,12 +2779,12 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü. .dll ¥Õ¥¡¥¤¥ë¤Ï¥í¥«¡¼¥ë¤Ë°Í¸¤·¤¿Ì¾Á°¤ò»ý¤Ä\n"
 "»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl ¥â¡¼¥É¤Ë¤ª¤±¤ëÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2790,17 +2793,17 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ"
 "¤¹.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Î½ÐÎÏ\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ·Á¼°¤Ç½ÐÎÏ\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2821,12 +2824,12 @@ msgstr ""
 "ºÇ½é¤ÎËÝÌõ¤«¤é¼è¤ê½Ð¤µ¤ì¤Þ¤¹. ¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤Ϥ½¤Î¤Þ¤Þ»Ä¤ê¤Þ¤¹. --unique\n"
 "¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤È½ÅÊ£¤Ï̵»ë¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              ½ÅÊ£¤·¤Æ¤¤¤ë¤â¤Î¤Î¤ß¤òɽ¼¨\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2969,7 +2972,7 @@ msgstr "ʸ
 msgid "context separator <EOT> within string"
 msgstr "ʸ»úÎóÃæ¤Îʸ̮¥»¥Ñ¥ì¡¼¥¿ <EOT>"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹"
@@ -3155,33 +3158,33 @@ msgstr "
 msgid "standard output"
 msgstr "ɸ½à½ÐÎÏ"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê \"%s\" ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Àµ¤·¤¤ Java ¥¯¥é¥¹Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤¹¤« $JAVAC ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. $JAVAC ¤òÀßÄꤷ¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
@@ -3315,7 +3318,7 @@ msgstr "%s:%d: 
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3416,32 +3419,32 @@ msgstr "%s:%d: 
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF ¤ÎÁ°¤Î¤É¤³¤Ë¤âʸ»úÎó½ªÃ¼ \"%s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} ¤Ë±¦³ç¸Ì¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\l\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\u\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" ¤ËÉÔÀµ¤ÊÊÑ¿ôÊä´Ö"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\L\") 8bit ʸ»ú \"%c\""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\U\") 8bit ʸ»ú \"%c\""
@@ -3546,27 +3549,27 @@ msgstr ""
 "%s:%lu: ·Ù¹ð: ʸˡ $\"...\" ¤Ï¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ç¿ä¾©¤µ¤ì¤Þ¤»¤ó. Âå¤ï¤ê¤Ë "
 "eval_gettext ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing ¤Ï½ÐÎÏÀ褬ɸ½à½ÐÎϤξì¹ç¤Ë¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë `%s' (³ÈÄ¥»Ò `%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3574,23 +3577,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   ½ÐÎÏ¤Ë NAME.po ¤ò»ÈÍÑ (message.po ¤ÎÂå¤ï¤ê)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¸À¸ì¤ÎÁªÂò:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3609,19 +3612,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ¤Îû½Ì·Á\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3630,22 +3633,22 @@ msgstr ""
 "      --from-code=NAME           ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 "                                         (Python, Tcl, Glade °Ê³°)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ½à¤Ç¤Ï, ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï ASCII ¤È²¾Äꤵ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤È¥á¥Ã¥»¡¼¥¸¤ò·ë¹ç\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  FILE.po ¤«¤é¤Î¹àÌܤÏÃê½Ð¤µ¤ì¤Ê¤¤\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3657,17 +3660,17 @@ msgstr ""
 "  -c, --add-comments[=TAG]     TAG (¤Þ¤¿¤Ï¥­¡¼¥ï¡¼¥É¹Ô) ¤òÉÕ¤±¤Æ\n"
 "                               ¥³¥á¥ó¥ÈÉôʬ¤ò½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "¸À¸ì»ØÄꥪ¥×¥·¥ç¥ó:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           Á´¤Æ¤Îʸ»úÎó¤òÃê½Ð\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3681,7 +3684,7 @@ msgstr ""
 "                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade ¸À"
 "¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3690,7 +3693,7 @@ msgstr ""
 "  -k, --keyword[=WORD]         µá¤á¤ë¥­¡¼¥ï¡¼¥É¤Î»ØÄê (WORD ¤¬»ØÄꤵ¤ì\n"
 "                               ¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Î¥­¡¼¥ï¡¼¥É¤Ï»È¤ï¤ì¤Ê¤¤)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3701,7 +3704,7 @@ msgstr ""
 "¤¹¤ë\n"
 "                              Éղåե饰\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3715,77 +3718,77 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC¥½¡¼¥¹ ¸À¸ì"
 "¤Î¤ß)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  Ãøºî¸¢ÊÝÍ­¼Ô¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          ¾¹ñ¤Î¥æ¡¼¥¶¸þ¤±¤Ë½ÐÎÏÃæ¤Î FSF Ãøºî¸¢¤ò¾Êά\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ¥Ñ¥Ã¥±¡¼¥¸¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ¤Î¥Ð¥°Êó¹ðÍÑ¥¢¥É¥ì¥¹¤òÀßÄê\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3794,7 +3797,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=STRING]  msgstr ¹àÌܤÎÀÜƬ¼­¤Ë STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3803,7 +3806,7 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=STRING]  msgstr ¹àÌܤÎÀÜÈø¼­¤Ë STRING ¤« \"\" ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3811,31 +3814,31 @@ msgid ""
 msgstr ""
 "--flag °ú¿ô¤Ï <keyword>:<argnum>:[pass-]<flag> ʸˡ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó: %s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "ɸ½àÆþÎÏ"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ·Ù¹ð: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3844,7 +3847,7 @@ msgstr ""
 "¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Î°ÌÃ֤ǻȤï¤ì¤Æ¤¤¤Þ¤¹¤¬, %s ¤ÏÀµ¤·¤¤ %s ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó"
 "¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íýͳ: %s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3853,7 +3856,7 @@ msgstr ""
 "¤½¤Î¤è¤¦¤ËÀë¸À¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬, '%s' ¤ÏÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íý"
 "ͳ: %s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3866,7 +3869,7 @@ msgstr ""
 "̾Á°ÉÕ¤­°ú¿ô¤Î¤¢¤ë¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ò»È¤¦¤³¤È, ³î¤Ä°ú¿ô¤ËÂФ·¤ÆÁÈ (tuple)\n"
 "¤ÎÂå¤ï¤ê¤Ë¥Þ¥Ã¥Ô¥ó¥°¤ò»È¤¦¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3876,27 +3879,27 @@ msgstr ""
 "gettxt(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n"
 "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ë°ú¿ô»ØÄ꤬ۣËæ¤Ç¤¹"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ÎÊ£¿ô·Á°ú¿ô¤Ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ʸ̮¤¬Ã±¿ô·Ï¤ÈÊ£¿ô·Á¤Ç°ìÃפ·¤Þ¤»¤ó"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3908,7 +3911,7 @@ msgstr ""
 "¤¤.\n"
 "¤â¤·¤¯¤Ï, ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó --msgid-bugs-address ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "¸À¸ì `%s' ¤ÏÃΤê¤Þ¤»¤ó"
@@ -3917,6 +3920,9 @@ msgstr "
 msgid "<unnamed>"
 msgstr "<̾Á°¤Ê¤·>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "¥¨¥é¡¼¥³¡¼¥É 0x%08x ¤Ç DuplicateHandle ¼ºÇÔ"
 

diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index 5e8a7c4e95d9d6b10ebd7875a04b6703804e53dd..f8722b726b540bd7ed1b61ac981c8b24dc0482d5 100644 (file)
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-21 11:35+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -34,22 +34,22 @@ msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 애매합니다"
 msgid "Valid arguments are:"
 msgstr "올바른 인자는 다음과 같습니다:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "임시 디렉터리가 없습니다, $TMPDIR 환경변수를 세팅하십시오"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "틀 \"%s\"을(를) 이용해 임시 디렉터리를 만들 수 없습니다"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "임시 파일 %s을(를) 지울 수 없습니다"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
@@ -58,10 +58,10 @@ msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "읽기 위해 \"%s\"을(를) 여는 동안 오류 발생"
@@ -87,8 +87,8 @@ msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 msgid "error after reading \"%s\""
 msgstr "\"%s\" 파일을 읽은 후에 오류 발생"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -105,74 +105,73 @@ msgstr "C# 컴파일러가 없습니다. pnet을 설치해 보십시오"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# 가상기계가 없습니다. pnet을 설치해 보십시오"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 서브프로세스가 실패했습니다"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s'은(는) 모호한 옵션입니다\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: 잘못된 옵션 -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 부적절한 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -184,14 +183,14 @@ msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class에 대한 target_version 인자가 잘못되었습니다"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\"을(를) 만드는 데 실패했습니다"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -209,8 +208,8 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 서브프로세스 입출력 오류"
@@ -222,8 +221,8 @@ msgstr "%s 서브프로세스 입출력 오류"
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "파이프를 만들 수 없습니다"
@@ -285,7 +284,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -294,7 +293,7 @@ msgstr "'%2$s' 안에 있는, 인자 %1$u에 대한 서식 지정이 'msgid'에
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -302,7 +301,7 @@ msgstr "인자 %u에 대한 서식 지정이 '%s'에 없습니다"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -702,11 +701,11 @@ msgid ""
 "1 and 9."
 msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -719,38 +718,38 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s이(가) 만들었습니다.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "브루노 헤이블 (Bruno Haible)"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "인수가 너무 많음"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "사용법: %s [<옵션>]\n"
@@ -785,29 +784,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      호스트이름에 대한 주소\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "정보 출력:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  이 도움말을 보여주고 끝납니다\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
@@ -816,11 +815,11 @@ msgstr "  -V, --version               버전 정보를 표시하고 끝납니다
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 
@@ -829,30 +828,30 @@ msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 msgid "could not get host name"
 msgstr "호스트이름을 알아낼 수 없습니다"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "최대 한 개의 입력파일만이 허용됩니다"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s과(와) %s은(는) 서로 배타적입니다"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "사용법: %s [옵션] [입력파일]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -861,62 +860,62 @@ msgstr ""
 "번역 메시지들을 그 속성에 따라 걸러내고, 그 속성을 조작합니다.\n"
 "\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "입력 파일 위치:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  <입력파일>                     입력 PO 파일\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=<디렉터리>  입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서 읽습니다.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "출력 파일 위치:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=<파일>   지정한 파일로 출력합니다\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -925,12 +924,12 @@ msgstr ""
 "만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
 "출력합니다.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "메시지 선택:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -938,7 +937,7 @@ msgstr ""
 "      --translated            번역되었으면 놔 두고, 번역되지 않았으면 지웁니"
 "다\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -946,54 +945,54 @@ msgstr ""
 "      --untranslated          번역되지 않았으면 놔 두고, 번역되었으면 지웁니"
 "다\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy'로 표시된 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy'로 표시된 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           없어진 #~ 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         없어진 #~ 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "속성 조작:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니다\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 만듭니다\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1001,27 +1000,27 @@ msgid ""
 msgstr ""
 "      --clear-previous        모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=<파일>.po   <파일>.po에 들어 있는 항목만 조작합니다\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1029,24 +1028,24 @@ msgstr ""
 "      --obsolete              \"--only-obsolete --clear-obsolete\"와 동일합니"
 "다\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "입력 파일 문법:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1055,26 +1054,49 @@ msgstr ""
 "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "출력 상세:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 색이나 기타 텍스트 속성을 항상 사용합니다\n"
+"      --color=<상황>          색이나 기타 텍스트 속성을 <상황>에 사용합니다\n"
+"                              <상황>은 'always', 'never', 'auto', 혹은 "
+"'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1082,68 +1104,68 @@ msgstr ""
 "  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
 "습니다\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              비어 있는 파일이라도 PO 파일로 씁니다\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                들여쓰기된 스타일로 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: 파일이름:줄번호' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     NeXTstep/GNUstep .strings 파일을 씁니다\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=<숫자>          출력 페이지의 너비를 지정합니다\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1152,26 +1174,26 @@ msgstr ""
 "      --no-wrap               출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
 "                              자르지 않습니다.\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           정렬된 출력을 만들어 냅니다\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "불가능한 선택 조건을 지정하였습니다 (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "사용법: %s [<옵션>] [<입력파일>]...\n"
@@ -1199,23 +1221,23 @@ msgstr ""
 "나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
 "위치는 그대로 유지될 것입니다.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  입력파일 ...                입력 파일\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=<파일>     입력 파일의 목록을 <파일>에서 읽습니다\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1233,7 +1255,7 @@ msgstr ""
 "  -<, --less-than=<크기>      지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1242,8 +1264,8 @@ msgstr ""
 "  -u, --unique                --less-than=2를 짧게 쓴 것입니다.\n"
 "                              유일한 메시지만을 출력합니다.\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1251,8 +1273,8 @@ msgstr ""
 "  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습"
 "니다\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1261,12 +1283,12 @@ msgstr ""
 "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=<이름>          출력의 인코딩\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1275,47 +1297,28 @@ msgstr ""
 "      --use-first               각 메시지중에서 첫번째로 나타나는 번역문만\n"
 "                                사용하고, 여러 번역문을 합치지 않습니다\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 색이나 기타 텍스트 속성을 항상 사용합니다\n"
-"      --color=<상황>          색이나 기타 텍스트 속성을 <상황>에 사용합니다\n"
-"                              <상황>은 'always', 'never', 'auto', 혹은 "
-"'html'.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "피터 밀러 (Peter Miller)"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "정확히 2개의 입력 파일이 필요합니다"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "사용법: %s [<옵션>] def.po ref.pot\n"
@@ -1347,12 +1350,12 @@ msgstr "  def.po                      번역문\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     소스를 참조\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "동작 변경:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1361,7 +1364,7 @@ msgstr ""
 "  -m, --multi-domain          ref.pot 파일을 def.po의 각 도메인에 적용합니"
 "다\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     퍼지 매칭을 하지 않습니다\n"
@@ -1386,17 +1389,17 @@ msgstr "이 메시지는 번역되지 않았습니다"
 msgid "this message needs to be reviewed by the translator"
 msgstr "이 메시지는 번역자의 검토가 필요합니다"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "이 메시지는 사용되지만 정의되지 않았습니다..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...하지만 이 정의는 유사합니다"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
@@ -1412,12 +1415,12 @@ msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d개의 치명적인 오류를 찾았습니다"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "최소한 두 개의 파일을 지정해야 합니다"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1438,7 +1441,7 @@ msgstr ""
 "나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
 "위치는 그대로 유지될 것입니다.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1447,70 +1450,70 @@ msgstr ""
 "  ->, --more-than=<크기>         지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                                 이 옵션이 없을 경우에 기본값은 1입니다.\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header              헤더에 `msgid \"\"' 항목을 쓰지 않습니다\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "번역 목록을 다른 문자 인코딩으로 변환합니다.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "변환 목표:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                   들여쓰기된 출력 형태\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location              ''#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          '#: filename:line' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "정확히 한 개의 입력 파일이 필요합니다"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "사용법: %s [<옵션>] <입력파일>\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1523,7 +1526,7 @@ msgstr ""
 "번역되지 않은 항목은 msgid와 동일한 번역문이 할당될 것이고,\n"
 "퍼지로 표시될 것입니다.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  <입력파일>                   입력 PO 파일 혹은 POT 파일\n"
@@ -1562,7 +1565,7 @@ msgstr ""
 "특별히 내부 명령어 '0'은 번역문을 그대로 출력하고, 맨 끝에 0 널 바이트를 \n"
 "출력합니다. \"msgexec 0\"의 출력물은 \"xargs -0\"의 입력으로 사용하기에 적합합니다\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=<입력파일>       입력 PO 파일\n"
@@ -1577,27 +1580,27 @@ msgstr "표준 출력에 쓰기가 실패했습니다"
 msgid "write to %s subprocess failed"
 msgstr "%s 서브프로세스에 쓰기가 실패했습니다"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "필터 이름이 빠졌습니다"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "최소한 한 개의 sed 스크립트를 지정해야 합니다"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "사용법: %s [<옵션>] <필터> [<필터-옵션>]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "번역 목록의 모든 번역문에 대하여 필터를 적용합니다.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1606,19 +1609,19 @@ msgstr ""
 "\"필터\"는 표준 입력에서 번역문을 읽어서 수정된 번역문을 표준 출력으로\n"
 "출력하는 프로그램이면 어떤 프로그램이든 가능합니다.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1628,26 +1631,26 @@ msgstr ""
 "  -f, --file=<스크립트파일>   <스크립트파일>의 내용을 실행할 명령어에\n"
 "                              추가합니다.\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       패턴 공백을 자동으로 출력하지 않도록 합니다\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1666,22 +1669,22 @@ msgid "invalid endianness: %s"
 msgstr "엔디안이 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "울리히 드레퍼 (Ulrich Drepper)"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s은(는) \"-d 디렉터리\" 지정이 필요합니다"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s은(는) \"-d 로캘\" 지정이 필요합니다"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s은(는) %s 혹은 %s과(와) 함께 써야만 효과가 있습니다"
@@ -1726,7 +1729,7 @@ msgstr "사용법: %s [<옵션>] <파일이름>.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1740,7 +1743,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  <파일이름>.po ...             입력 파일\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "동작 모드:\n"
@@ -1794,7 +1797,7 @@ msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
@@ -1804,13 +1807,13 @@ msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
 msgid "Output file location in Java mode:\n"
 msgstr "자바 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=<리소스>     리소스 이름\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1840,7 +1843,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "C# 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1861,7 +1864,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d <디렉터리>               .msg 메시지 목록의 베이스 디렉터리\n"
@@ -1873,7 +1876,7 @@ msgid ""
 "specified directory.\n"
 msgstr "-l과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "입력 파일 해석:\n"
@@ -1954,7 +1957,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            번역에 대한 통계를 표시합니다\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               더 자세히 출력합니다\n"
@@ -2011,7 +2014,7 @@ msgstr "퍼지 `msgstr' 항목은 무시됨"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니다"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2022,7 +2025,7 @@ msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니
 msgid "error while reading \"%s\""
 msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2030,7 +2033,7 @@ msgid ""
 msgstr ""
 "'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2039,7 +2042,7 @@ msgstr ""
 "번역 목록에서 주어진 패턴에 맞는 메시지 혹은 주어진 소스 파일에 들어 있는\n"
 "메시지만을 뽑아 냅니다.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2113,24 +2116,24 @@ msgstr ""
 "  -i, --ignore-case           대소문자 구별을 하지 않습니다\n"
 "  -v, --invert-match          지정한 옵션에 맞지 않는 메시지만을 출력합니다\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           정렬된 출력을 만듭니다\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          파일의 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2140,7 +2143,7 @@ msgstr ""
 "여러분의 LANG 환경변수를 세팅하십시오. 세팅해야만이 여러분의\n"
 "번역문을 테스트할 수 있습니다.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2151,12 +2154,12 @@ msgstr ""
 "--locale 옵션으로 로캘을 지정하거나 --output-file 옵션으로\n"
 "출력 .po 파일을 지정하십시오.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s을(를) 만들었습니다.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2165,12 +2168,12 @@ msgstr ""
 "새로운 PO 파일을 만들고, 사용자의 환경에서 메타 정보들을\n"
 "초기화합니다\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=<입력파일>       입력 POT 파일\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2180,12 +2183,12 @@ msgstr ""
 "만약 입력 파일이 주어지지 않으면, 현재 디렉터리에서 POT 파일을 찾습니다.\n"
 "입력 파일이 \"-\"이면, 표준 입력을 읽습니다.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=<파일>    지정한 PO 파일로 출력합니다\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2194,19 +2197,19 @@ msgstr ""
 "만약 출력 파일이 주어지지 않으면, --locale 옵션이나 사용자의 로캘 세팅에\n"
 "따라 결정됩니다. 출력 파일이 \"-\"이면, 표준 출력에 씁니다.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          목표 로캘을 지정합니다\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO 파일이 자동으로 만들어졌다고 가정합니다\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2214,12 +2217,12 @@ msgstr ""
 "두 개 이상의 .pot 파일을 찾았습니다.\n"
 "입력 .pot 파일을 --input 옵션으로 지정하십시오.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "현재 디렉터리를 읽는 데 오류가 발생했습니다"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2227,14 +2230,14 @@ msgstr ""
 "현재 디렉터리에서 .pot 파일을 찾을 수 없습니다.\n"
 "--input 옵션으로 입력 .pot 파일을 지정하십시오.\n"
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 서브프로세스가 종료코드 %d(으)로 실패했습니다"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2249,7 +2252,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 패키지에 대한 한국어 번역문"
@@ -2286,7 +2289,7 @@ msgstr "목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "경고: "
@@ -2527,7 +2530,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "입력 파일은 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2546,7 +2549,7 @@ msgstr ""
 "아 집니다."
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2555,16 +2558,16 @@ msgstr ""
 "\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
 "이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "백업 종류"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2587,17 +2590,17 @@ msgstr ""
 "보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻기 위해 퍼지 \n"
 "매칭이 사용됩니다.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      과거 소스를 참조하는 번역문\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     새로운 소스를 참조\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2606,7 +2609,7 @@ msgstr ""
 "  -C, --compendium=<파일>      메시지 번역 라이브러리 추가,\n"
 "                               두 개 이상 지정할 수 있습니다\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2616,28 +2619,28 @@ msgstr ""
 "                              이미 def.po를 업데이트했다면 아무 것도 안 합니"
 "다\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "업데이트 모드에서 출력 파일 위치:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2656,7 +2659,7 @@ msgstr ""
 "히\n"
 "  simple, never   간단한 백업만을 만듭니다\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2666,29 +2669,29 @@ msgstr ""
 "--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접"
 "미어는 '~'입니다.\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       진행상태 표시를 하지 않습니다\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "이 메시지는 복수형을 지정해야만 합니다"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2697,28 +2700,28 @@ msgstr ""
 "%s%ld개의 예전 것 + %ld개의 참조문, 결합된 것 %ld, 퍼지 %ld, 빠진 것 %ld, 쓸"
 "모없는 것 %ld개를 읽었습니다.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " 완료.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s과(와) 파일이름을 명시적으로 지정하는 것은 동시에 쓸 수 없습니다"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "사용법: %s [<옵션>] [<파일>]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "이진 메시지 목록을 Uniforum 스타일 .po 파일로 변환합니다.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2727,12 +2730,12 @@ msgstr ""
 "  -j, --java                  자바 모드: 입력은 자바 ResourceBundle 클래스입"
 "니다\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# 모드: 입력은 .NET .dll 파일입니다\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2741,24 +2744,24 @@ msgstr ""
 "      --csharp-resources      C# 리소스 모드: 입력은 .NET .resources 파일입니"
 "다\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl 모드: 입력은 tcl/msgcat .msg 파일입니다\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  <파일> ...                  입력 .mo 파일\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "자바 모드에서 입력 파일 위치:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2768,12 +2771,12 @@ msgstr ""
 "클래스 이름은 로캘 이름에 리소스 이름을 밑줄로 구분해서 연결한 이름으로\n"
 "결정됩니다. 클래스는 CLASSPATH에 따른 위치에 놓이게 됩니다.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 모드에서 입력 파일 지정:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2782,12 +2785,12 @@ msgstr ""
 "-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 아래\n"
 "디렉터리에 (디렉터리 이름은 로캘에 따라 달라집니다) 들어 있습니다.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 모드에서 입력 파일 지정:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2796,17 +2799,17 @@ msgstr ""
 "-l 옵션과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리\n"
 "아래에 들어 있습니다.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                들여쓰기된 출력 형태로 씁니다\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2827,12 +2830,12 @@ msgstr ""
 "번역문에 있는 것만을 쓰게 됩니다. 파일의 위치는 모두 유지될 것입니다.\n"
 "--unique 옵션을 사용할 때, 중복된 메시지들을  버립니다.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 중복된 메시지만을 출력합니다\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2976,7 +2979,7 @@ msgstr "문자열 내부에서 행이 끝남"
 msgid "context separator <EOT> within string"
 msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "이 파일은 도메인 지시자를 포함하고 있지 않을 수도 있습니다"
@@ -3156,34 +3159,34 @@ msgstr "출력 파일 \"%s\"을(를) 만들 수 없습니다"
 msgid "standard output"
 msgstr "표준 출력"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" 디렉터리를 만드는 데 실패했습니다"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# 클래스 컴파일에 실패했습니다. --verbose로 시도해 보십시오"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "C# 클래스 컴파일에 실패했습니다"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
 "를 세팅하십시오"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
@@ -3315,7 +3318,7 @@ msgstr "%s:%d: 경고: 완결되지 않은 문자 상수"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3417,32 +3420,32 @@ msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: 문자열을 끝내는 \"%s\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{십육진수}에서 오른쪽 중괄호가 빠졌습니다"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\l\")이 잘못되었습니다"
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\u\")이 잘못되었습니다"
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\"에서 변수 인터폴레이션이 잘못되었습니다"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\L\")이 잘못되었습니다"
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\U\")이 잘못되었습니다"
@@ -3542,27 +3545,27 @@ msgstr ""
 "%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다; 대신에 "
 "eval_gettext를 사용하십시오"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "경고: `%s' 파일의 확장자 `%s'을(를) 알 수 없습니다; C 형식으로 간주함"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3571,24 +3574,24 @@ msgstr ""
 "  -d, --default-domain=<이름>    출력에 (messages.po 대신) <이름>.po를 씁니"
 "다\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=<디렉터리>    출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "입력 파일의 언어 선택:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3607,12 +3610,12 @@ msgstr ""
 "PHP, \n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3620,7 +3623,7 @@ msgid ""
 msgstr ""
 "기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3629,24 +3632,24 @@ msgstr ""
 "      --from-code=<이름>      입력 파일의 인코딩\n"
 "                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "기본값으로 입력 파일은 ASCII로 인코딩되어 있다고 가정합니다.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=<파일.po>   <파일.po>의 메시지는 뽑아내지 않습니다\n"
 
 # TAG가 정확이 뭐지?
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3658,17 +3661,17 @@ msgstr ""
 "  -c, --add-comments[=<태그>]    주석 부분을 <태크>로 (혹은 키워드 줄 앞에\n"
 "                                 있는 것으로) 출력 파일에 씁니다\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3682,7 +3685,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3691,7 +3694,7 @@ msgstr ""
 "  -k, --keyword[=<단어>]         추가로 찾을 키워드 (<단어>가 없으면 기본\n"
 "                                 키워드를 사용하지 않겠다는 의미입니다)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3701,7 +3704,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
 "                              추가 플래그\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3715,56 +3718,56 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs                입력에서 ANSI C 삼중자(trigraph)를 인식합니"
 "다\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++만 지원)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    더 자세한 형식문자열 인식 결과\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3772,17 +3775,17 @@ msgstr ""
 "      --foreign-user             외부 사용자를 위해 FSF 저작권 표시를 뺍니"
 "다\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지정합니다\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3790,7 +3793,7 @@ msgstr ""
 "      --msgid-bugs-address=이메일@주소     msgid 버그를 보고할 주소를 지정합"
 "니다\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3800,7 +3803,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=<문자열>] msgstr 항목에 <문자열> 혹은 \"\"을 접두어"
 "로\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3810,38 +3813,38 @@ msgstr ""
 "  -M, --msgstr-suffix[=<문자열>] msgstr 항목에 <문자열> 혹은 \"\"을 접미어"
 "로\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag의 인자가 <keyword>:<argnum>:[pass-]<flag> 문법이 아닙니다: %s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "표준 입력"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 경고: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3850,7 +3853,7 @@ msgstr ""
 "형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니다. "
 "이유: %s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3858,7 +3861,7 @@ msgid ""
 msgstr ""
 "선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3871,7 +3874,7 @@ msgstr ""
 "이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
 "아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3881,27 +3884,27 @@ msgstr ""
 "gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
 "헤더 항목을 리턴합니다.\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3913,7 +3916,7 @@ msgstr ""
 "변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
 "명령행 옵션을 사용하십시오.\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "\"%s\" 파일에 NUL로 끝나지 않는 sysdep 세그먼트가 있습니다"
@@ -3922,6 +3925,9 @@ msgstr "\"%s\" 파일에 NUL로 끝나지 않는 sysdep 세그먼트가 있습
 msgid "<unnamed>"
 msgstr "<이름없음>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: 잘못된 옵션 -- %c\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle이 오류 코드 0x%08x번으로 실패했습니다"
 

diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index c4d6db54d5c20a701f013fd9d0749a5d01d35ec4..1537fd8353aeb514a54c6461badf38d53763c99b 100644 (file)
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,22 +31,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke opprette utfilen «%s»"
@@ -54,44 +55,44 @@ msgstr "kan ikke opprette utfilen 
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under åpning av «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "feil under lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "feil under skriving av filen «%s»"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "feil under lesing av «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -101,74 +102,73 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flagget «%s» er flertydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget «--%s» tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget «%c%s» tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg «--%s»\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg «%c%s»\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig flagg -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg «-W %s» er flertydig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flagget «%s» krever et argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -180,20 +180,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen «%s»"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -203,20 +203,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -235,70 +235,69 @@ msgstr "kan ikke opprette utfilen 
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-boost.c:449
@@ -323,9 +322,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -365,48 +364,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -498,19 +497,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -524,11 +522,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -576,12 +574,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-perl.c:433
@@ -591,54 +589,51 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -675,11 +670,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -688,38 +683,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -752,29 +747,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -783,11 +778,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -797,294 +792,312 @@ msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger nøyaktig to innfiler"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1103,31 +1116,31 @@ msgstr ""
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1157,105 +1170,97 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ingen innfiler angitt"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "trenger nøyaktig to innfiler"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1278,81 +1283,86 @@ msgstr ""
 "alle meldingene i programmet ditt.  Når en eksakt overensstemmelse ikke\n"
 "finnes, blir «fuzzy»-sammenligning brukt for å få en bedre diagnostikk.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldingen er brukt, men ikke definert..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen ligner"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fant %d fatale feil"
 msgstr[1] "fant %d fatale feil"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst to filer må angis"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1381,74 +1391,74 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "trenger nøyaktig to innfiler"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1457,22 +1467,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "mangler argumenter"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1482,67 +1492,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "mangler argumenter"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst to filer må angis"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1550,210 +1560,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1762,48 +1754,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1811,33 +1803,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1845,115 +1837,115 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet «%s» passer ikke som filnavn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "nøkkelord «domain %s» ignorert"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "tom «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "antatt «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1993,30 +1985,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2024,24 +2016,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2049,54 +2041,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2108,54 +2100,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2164,7 +2156,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2173,7 +2165,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2182,12 +2174,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2195,7 +2187,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2204,7 +2196,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2212,158 +2204,158 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "filhodefelt «%s» mangler i filhode"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under åpning av «%s» for lesing"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2372,15 +2364,15 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2389,16 +2381,16 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2423,51 +2415,51 @@ msgstr ""
 "resultater.  Resultatet blir skrevet til standard ut, med mindre en utfil\n"
 "er spesifisert.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2479,7 +2471,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2487,33 +2479,28 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2522,61 +2509,63 @@ msgstr ""
 "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
 "foreldete %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " ferdig.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2584,41 +2573,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2631,19 +2620,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2729,65 +2718,65 @@ msgstr "f
 msgid "plural form has wrong index"
 msgstr "flertallsform har feil indeks"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nøkkelord «%s» ukjent"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "slutt-på-fil inne i streng"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "slutt-på-linje inne i streng"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplisert definisjon av melding"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "... dette er lokasjonen til den første definisjonen"
@@ -2877,28 +2866,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under åpning av «%s» for lesing"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "for mange argumenter"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av filen «%s»"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2930,41 +2934,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2974,14 +2978,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2990,7 +2994,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3007,8 +3011,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3025,13 +3029,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av filen «%s»"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3049,99 +3053,96 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3150,55 +3151,53 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3206,7 +3205,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3214,7 +3213,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3222,7 +3221,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3230,7 +3229,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3238,78 +3237,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3321,58 +3320,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3381,14 +3383,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3396,7 +3398,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3405,119 +3407,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3526,34 +3545,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3561,7 +3580,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "språket «%s» er ukjent"
@@ -3570,6 +3589,13 @@ msgstr "spr
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ulovlig flagg -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet «%s» har fremdeles sin forvalgte verdi"
+
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
 #~ msgid ""
@@ -3863,7 +3889,8 @@ msgstr ""
 #~ "miljøvariabelen TEXTDOMAIN.  Dersom meldingskatalogen ikke finnes i den\n"
 #~ "vanlige katalogen, kan en annen katalog spesifiseres ved hjelp av\n"
 #~ "miljøvariabelen TEXTDOMAIN.\n"
-#~ "Når flagget -s blir brukt, oppfører programmet seg som kommandoen «echo».\n"
+#~ "Når flagget -s blir brukt, oppfører programmet seg som kommandoen "
+#~ "«echo».\n"
 #~ "Programmet kopierer imidlertid ikke sine argumenter til standard ut.  I\n"
 #~ "stedet blir funne meldinger i den valgte katalogen oversatt.\n"
 #~ "Standard søkekatalog er: %s\n"

diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index c4bb200c9ee618ad399430b7d6be1fc741a67646..fc3897464accd9c07003acdcc04c0fc531c95030 100644 (file)
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-10 12:48+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -35,22 +35,22 @@ msgstr "argument %s van %s is niet eenduidig"
 msgid "Valid arguments are:"
 msgstr "Geldige argumenten zijn:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan geen tijdelijke map vinden; zet $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan met sjabloon '%s' geen tijdelijke map aanmaken"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan tijdelijk bestand '%s' niet verwijderen"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan tijdelijke map '%s' niet verwijderen"
@@ -59,10 +59,10 @@ msgstr "kan tijdelijke map '%s' niet verwijderen"
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fout bij openen van '%s' voor lezen"
@@ -88,8 +88,8 @@ msgstr "fout bij schrijven van '%s'"
 msgid "error after reading \"%s\""
 msgstr "fout na lezen van '%s'"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -106,74 +106,73 @@ msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "subproces %s is mislukt"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, 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:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, 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:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: optie '%s' vereist een argument\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: optie '%s' vereist een argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,14 +184,14 @@ msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "aanmaken van '%s' is mislukt"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -208,8 +207,8 @@ msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fout in subproces %s"
@@ -221,8 +220,8 @@ msgstr "I/O-fout in subproces %s"
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan geen pijp aanmaken"
@@ -283,7 +282,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -292,7 +291,7 @@ msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -300,7 +299,7 @@ msgstr "opmaakcode voor argument %u komt niet voor in '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -731,11 +730,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -749,38 +748,38 @@ msgstr ""
 "zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...]\n"
@@ -813,29 +812,29 @@ msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version       programmaversie tonen en stoppen\n"
@@ -844,11 +843,11 @@ msgstr "  -V, --version       programmaversie tonen en stoppen\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
@@ -859,321 +858,339 @@ msgstr ""
 msgid "could not get host name"
 msgstr "kan hostnaam niet verkrijgen"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s en %s sluiten elkaar uit"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Berichtenselectie:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
@@ -1192,23 +1209,23 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1222,76 +1239,62 @@ msgid ""
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "geen invoerbestanden gegeven"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precies twee invoerbestanden zijn vereist"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Gebruik:  %s [OPTIE...] bestaande.po referentie.pot\n"
@@ -1324,19 +1327,19 @@ msgstr "  bestaande.po                bestaand bestand met vertalingen\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  referentie.pot              verwijzingen naar de programmatekst\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1361,17 +1364,17 @@ msgstr "dit bericht is onvertaald"
 msgid "this message needs to be reviewed by the translator"
 msgstr "dit bericht moet door een vertaler gecontroleerd worden"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...maar de definitie is gelijksoortig"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
@@ -1388,12 +1391,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "%d fatale fout gevonden"
 msgstr[1] "%d fatale fouten gevonden"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "er moeten minstens twee bestanden opgegeven worden"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1406,74 +1409,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "precies één invoerbestand is vereist"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Gebruik:  %s [OPTIE...] INVOERBESTAND\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1482,7 +1485,7 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1514,7 +1517,7 @@ msgid ""
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1529,27 +1532,27 @@ msgstr "schrijven naar standaarduitvoer is mislukt"
 msgid "write to %s subprocess failed"
 msgstr "schrijven naar subproces %s is mislukt"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "ontbrekende filternaam"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "er moet minstens één sed-script gegeven worden"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Gebruik:  %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Een filter toepassen op alle vertalingen in een PO-bestand.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1558,18 +1561,18 @@ msgstr ""
 "Het FILTER kan elk programma zijn dat een bericht leest van standaardinvoer\n"
 "en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1577,24 +1580,24 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1611,22 +1614,22 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
@@ -1674,7 +1677,7 @@ msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1688,7 +1691,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
@@ -1735,7 +1738,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1745,13 +1748,13 @@ msgstr ""
 msgid "Output file location in Java mode:\n"
 msgstr "Locatie van uitvoerbestand in Java-modus:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1778,7 +1781,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1797,7 +1800,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locatie van uitvoerbestand in Tcl-modus:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1809,7 +1812,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1878,7 +1881,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -1935,7 +1938,7 @@ msgstr "vaag 'msgstr'-item is genegeerd"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -1946,7 +1949,7 @@ msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -1955,14 +1958,14 @@ msgstr ""
 "optie '%c' kan niet gebruikt worden voordat\n"
 "'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2002,30 +2005,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2033,24 +2036,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Aangemaakt op %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2058,54 +2061,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fout bij lezen van huidige map"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subproces %s is mislukt met afsluitwaarde %d"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2117,7 +2120,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Nederlandse vertalingen voor het pakket %s"
@@ -2152,7 +2155,7 @@ msgstr "doeltekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
@@ -2371,7 +2374,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2386,23 +2389,23 @@ msgid ""
 msgstr ""
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is alleen geldig met %s"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2426,52 +2429,52 @@ msgstr ""
 "Wanneer er geen exacte overeenkomst is, wordt er ook naar vage gelijkenissen\n"
 "gekeken, om een beter resultaat te produceren.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  bestaande.po                bestaand bestand met oude vertalingen\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 "  referentie.pot              verwijzingen naar nieuwe programmatekst\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Locatie van uitvoerbestand in update-modus:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Het resultaat wordt teruggeschreven naar bestaande.po.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2483,7 +2486,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2491,28 +2494,28 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "dit bericht dient meervouden te definiëren"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "dit bericht dient geen meervouden te definiëren"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2521,63 +2524,63 @@ msgstr ""
 "%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, "
 "%ld vervanderd, %ld ontbreken, %ld verouderd.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " voltooid.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s en expliciete bestandsnamen gaan niet samen"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [BESTAND]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Locatie van invoerbestand in Java-modus:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2585,41 +2588,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Locatie van invoerbestand in C#-modus:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Locatie van invoerbestand in Tcl-modus:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2632,12 +2635,12 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2777,7 +2780,7 @@ msgstr "regeleindeteken IN een tekenreeks"
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
@@ -2949,32 +2952,32 @@ msgstr "kan uitvoerbestand '%s' niet aanmaken"
 msgid "standard output"
 msgstr "standaarduitvoer"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kan map '%s' niet aanmaken"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3079,7 +3082,7 @@ msgstr "%s:%d: waarschuwing: onafgesloten tekenconstante"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3165,32 +3168,32 @@ msgstr "%s:%d: waarschuwing: losse U+%04X"
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: kan tekenreeksafsluiter '%s' niet vinden"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: ontbrekend rechterhaakje in \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
@@ -3268,54 +3271,54 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
 "standaarduitvoer wordt geschreven"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
 "aangenomen"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Vertaalbare berichten extraheren uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3327,41 +3330,41 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3371,17 +3374,17 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3390,14 +3393,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3405,7 +3408,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3414,75 +3417,75 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3490,7 +3493,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3498,52 +3501,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: waarschuwing: "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3552,34 +3555,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3587,7 +3590,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "taal '%s' is onbekend"
@@ -3596,6 +3599,9 @@ msgstr "taal '%s' is onbekend"
 msgid "<unnamed>"
 msgstr "<ongenoemd>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle() is mislukt met foutcode 0x%08x"
 

diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index 259cd4891ccddb098f4a0918114ced4ac1d52eca..3384608040e4652f0e7e8e160bd29f9ec5d5bc08 100644 (file)
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-06-17 22:37+0200\n"
 "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -34,22 +34,22 @@ msgstr "Fleirtydig argument %s for %s"
 msgid "Valid arguments are:"
 msgstr "Gyldige argument er:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "Finn inga mellombels mappe. Prøv å velja «$TMPDIR»"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "Klarer ikkje laga mellombels mappe med malen «%s»"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Klarer ikkje fjerna mellombelsfila «%s»"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
@@ -58,10 +58,10 @@ msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
 msgid "write error"
 msgstr "Skrivefeil"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Feil ved opning av fila «%s» for lesing"
@@ -87,8 +87,8 @@ msgstr "Feil ved skriving til «%s»"
 msgid "error after reading \"%s\""
 msgstr "Feil etter lesing av «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -105,74 +105,73 @@ msgstr "Fann ikkje C#-kompilatoren. Prøv å installera «pnet»."
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Fann ikkje virtuell maskin for C#. Prøv å installera «pnet»."
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Underprosessen %s var mislukka"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: Flagget «%s» er fleirtydig\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, 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:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: Flagget «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: Flagget «%s» treng eit argument\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: Flagget «--%s» er ukjent\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: Flagget «%c%s» er ukjent\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: Flagget «-- %c» er ulovleg\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, fuzzy, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: Flagget «--%s» er ugyldig\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: Flagget treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: Flagget «-W %s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: Flagget «-W %s» tek ikkje argument\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Flagget «%s» treng eit argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -184,14 +183,14 @@ msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "Ugyldig «target_version»-argument til «compile_java_class»"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Klarte ikkje oppretta «%s»"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -211,8 +210,8 @@ msgstr ""
 "Fann ikkje virtuell maskin for Java. Prøv å installera «gij» eller vel "
 "«$JAVA»."
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Inn/ut-feil i underprosessen %s"
@@ -224,8 +223,8 @@ msgstr "Inn/ut-feil i underprosessen %s"
 msgid "memory exhausted"
 msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "Klarer ikkje oppretta røyr"
@@ -287,7 +286,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -298,7 +297,7 @@ msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -306,7 +305,7 @@ msgstr "Ein formatspesifikasjon for argumentet %u finst ikkje i «%s»"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -734,11 +733,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -751,38 +750,38 @@ msgstr ""
 "Dette er fri programvare. Du kan fritt endra og distribuera henne vidare.\n"
 "Det er INGEN GARANTI for dette produktet utover det som står i lova.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrive av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argument"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Bruk: %s [VAL]\n"
@@ -815,29 +814,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -846,11 +845,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
@@ -859,320 +858,338 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1191,23 +1208,23 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1221,76 +1238,62 @@ msgid ""
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -1327,19 +1330,19 @@ msgstr ""
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1364,17 +1367,17 @@ msgstr "advarsel: denne meldinga er ikkje brukt"
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
@@ -1391,12 +1394,12 @@ msgid_plural "found %d fatal errors"
 msgstr[0] "fann %d fatale feil"
 msgstr[1] "fann %d fatale feil"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1409,74 +1412,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1485,7 +1488,7 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
@@ -1517,7 +1520,7 @@ msgid ""
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1532,45 +1535,45 @@ msgstr ""
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1578,24 +1581,24 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1612,22 +1615,22 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
@@ -1675,7 +1678,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1687,7 +1690,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1734,7 +1737,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1744,13 +1747,13 @@ msgstr ""
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1777,7 +1780,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1796,7 +1799,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1808,7 +1811,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1877,7 +1880,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
@@ -1932,7 +1935,7 @@ msgstr ""
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -1943,21 +1946,21 @@ msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1997,30 +2000,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2028,24 +2031,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2053,54 +2056,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2112,7 +2115,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -2147,7 +2150,7 @@ msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2368,7 +2371,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2383,23 +2386,23 @@ msgid ""
 msgstr ""
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2424,51 +2427,51 @@ msgstr ""
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2480,7 +2483,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2488,28 +2491,28 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2518,63 +2521,63 @@ msgstr ""
 "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2582,41 +2585,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2629,12 +2632,12 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2766,7 +2769,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
@@ -2936,32 +2939,32 @@ msgstr "kan ikkje opprette utfila \"%s\""
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kan ikkje skifte til filkatalog \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3066,7 +3069,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3152,32 +3155,32 @@ msgstr ""
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
@@ -3255,51 +3258,51 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3311,41 +3314,41 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3355,17 +3358,17 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3374,14 +3377,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3389,7 +3392,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3398,75 +3401,75 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3474,7 +3477,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3482,52 +3485,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3536,34 +3539,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3571,7 +3574,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
@@ -3580,6 +3583,9 @@ msgstr ""
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: Flagget «-- %c» er ulovleg\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
 

diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index bfe7eefd0ba1a690b74cb2201bfbebb5d5845838..49f800a54865eb94f3f785e625e9b816b75bb346 100644 (file)
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-17 13:50+0200\n"
 "Last-Translator: Rafa³ Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -33,22 +34,22 @@ msgstr "niejednoznaczny argument %s opcji %s"
 msgid "Valid arguments are:"
 msgstr "Prawid³owe argumenty to:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nie mo¿na znale¼æ katalogu tymczasowego - nale¿y ustawiæ $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nie mo¿na utworzyæ katalogu tymczasowego przy u¿yciu szablonu \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nie mo¿na usun±æ pliku tymczasowego %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "nie mo¿na usun±æ katalogu tymczasowego przy %s"
@@ -57,44 +58,44 @@ msgstr "nie mo
 msgid "write error"
 msgstr "b³±d zapisu"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "b³±d w czasie otwierania \"%s\" do czytania"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "b³±d otwarcia kopii zapasowej \"%s\" do pisania"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "b³±d czytania \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "b³±d pisania do \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "b³±d po przeczytaniu \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() nie powiod³o siê"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Nie znaleziono kompilatora C#, proszê zainstalowaæ pnet"
@@ -104,74 +105,73 @@ msgstr "Nie znaleziono kompilatora C#, prosz
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Nie znaleziono maszyny wirtualnej C#, proszê zainstalowaæ pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nieznany b³±d systemu"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "niepowodzenie podprocesu %s"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcja: `%s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcja `%s' wymaga argumentu\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nierozpoznana opcja `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nierozpoznana opcja `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: niedozwolona opcja -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: b³êdna opcja -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcja wymaga argumentu -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opcja `%s' wymaga argumentu\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,20 +183,20 @@ msgstr "b
 msgid "invalid target_version argument to compile_java_class"
 msgstr "b³êdny argument target_version do compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tworzenie \"%s\" nie powiod³o siê"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "b³±d podczas pisania do pliku \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -209,20 +209,20 @@ msgstr ""
 "Nie znaleziono maszyny wirtualnej Javy, proszê zainstalowaæ gij lub ustawiæ "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "b³±d wej¶cia/wyj¶cia podprocesu %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamiêæ wyczerpana"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -241,73 +241,72 @@ msgstr "nie mo
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "\""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "b³±d DuplicateHandle, kod 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "b³±d _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "podproces %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s otrzyma³ krytyczny sygna³ %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' nie jest poprawnym formatem %s w przeciwieñstwie do 'msgid'.\n"
 "Powód: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "specyfikacja formatu dla argumentu %u, obecna w '%s', nie istnieje w 'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu %u nie istnieje w '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "ró¿ni±ce siê specyfikacje formatu w 'msgid' i '%s' dla argumentu %u"
 
 #: src/format-boost.c:449
@@ -335,9 +334,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Napis odwo³uje siê do argumentu numer %u, ale ignoruje argument numer %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "nie zgadza siê liczba specyfikacji formatu w 'msgid' i w '%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -381,18 +380,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "£añcuch zawiera samotny '}' po numerze dyrektywy %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "B³êdny po³±czenie flag w dyrektywie numer %u."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "W dyrektywie numer %u specyfikacja dok³adno¶ci nie jest dozwolona przed '%c'."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -401,7 +400,7 @@ msgstr ""
 "W dyrektywie numer %u numer argumentu specyfikacji dok³adno¶ci musi byæ "
 "równy %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -409,24 +408,24 @@ msgid ""
 msgstr ""
 "W dyrektywie numer %u specyfikacja dok³adno¶ci nie jest dozwolona przed '%c'."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "W dyrektywie numer %u jest b³êdna specyfikacja dok³adno¶ci."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "W dyrektywie numer %u flagi nie s± dozwolone przed '%c'."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' zawiera %%m, a '%s' nie"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' nie zawiera %%m, a '%s' zawiera"
 
 #: src/format-invalid.h:22
@@ -530,23 +529,22 @@ msgstr ""
 "ani '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "specyfikacja formatu dla argumentu {%u}, obecna w '%s', nie istnieje w "
 "'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu {%u} nie istnieje w '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "specyfikacje formatu w 'msgid' i w '%s' dla argumentu {%u} nie s± takie same"
 
@@ -563,11 +561,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "Za du¿o parametrów w dyrektywie numer %u, oczekiwano najwy¿ej %u parametru."
 msgstr[1] ""
@@ -620,13 +618,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "£añcuch odwo³uje siê do argumentu na niekompatybilne sposoby."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "specyfikacje formatu w 'msgid' i w '%s' nie s± równowa¿ne"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "specyfikacje formatu w '%s' nie s± podzbiorem tych z 'msgid'"
 
 #: src/format-perl.c:433
@@ -638,12 +636,12 @@ msgstr ""
 "W dyrektywie numer %u specyfikacja rozmiaru jest niezgodna ze specyfikacj± "
 "conwersji '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu '%s' nie istnieje w '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -651,51 +649,48 @@ msgstr ""
 "£añcuch odwo³uje siê do argumentów jednocze¶nie poprzez nazwy i nienazwane "
 "specyfikacje."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "£añcuch odwo³uje siê do argumentu o nazwie '%s' na niekompatybilne sposoby."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "specyfikacje formatu w 'msgid' oczekuj± mapowania, a te w '%s' oczekuj± "
 "krotki"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "specyfikacje formatu w 'msgid' oczekuj± krotki, a te w '%s' oczekuj± "
 "mapowania"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "specyfikacja formatu dla argumentu '%s', obecna w '%s', nie istnieje w "
 "'msgid'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "specyfikacje formatu w 'msgid' i w '%s' dla argumentu '%s' nie s± takie same"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "'msgid' jest w prostym formacie, a '%s' nie jest: zawiera flagê 'L' albo "
 "dwucyfrow± liczbê argumentów"
@@ -740,11 +735,11 @@ msgid ""
 "1 and 9."
 msgstr "Znak koñcz±cy dyrektywê %u nie jest cyfr± od 1 do 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -757,38 +752,38 @@ msgstr ""
 "To jest wolne oprogramowanie: mo¿esz je modyfikowaæ i rozpowszechniaæ.\n"
 "Autorzy NIE DAJ¡ GWARANCJI, na ile pozwala na to prawo.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Program napisa³ %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "za du¿o argumentów"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Polecenie `%s --help' poda wiêcej informacji.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Sk³adnia: %s [OPCJA]\n"
@@ -824,29 +819,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy komputera\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informacje:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  wy¶wietlenie tego opisu i zakoñczenie\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               wypisanie informacji o wersji i zakoñczenie pracy\n"
@@ -855,11 +850,11 @@ msgstr "  -V, --version               wypisanie informacji o wersji i zako
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporty o b³êdach prosimy wysy³aæ do bug-gnu-gettext@gnu.org .\n"
 
@@ -868,30 +863,30 @@ msgstr "Raporty o b
 msgid "could not get host name"
 msgstr "nie mo¿na odczytaæ nazwy komputera"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dozwolony najwy¿ej jeden plik wej¶ciowy"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s i %s wzajemnie siê wykluczaj±"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Sk³adnia: %s [OPCJA] [PLIK-WEJ¦CIOWY]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -900,65 +895,65 @@ msgstr ""
 "Filtrowanie komunikatów z katalogu t³umaczeñ zgodnie z ich atrybutami oraz\n"
 "manipulowanie atrybutami.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Argumenty obowi±zkowe dla opcji d³ugich s± obowi±zkowe tak¿e dla krótkich.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Po³o¿enie pliku wej¶ciowego:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  PLIK-WEJ¦CIOWY              wczytanie pliku PO\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=KATALOG     dodanie KATALOGU do listy poszukiwania plików\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Je¶li nie podano pliku wej¶ciowego lub plik to -, czytane jest standardowe\n"
 "wej¶cie.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Po³o¿enie pliku wyj¶ciowego:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=PLIK      zapisanie wyniku do podanego pliku\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -968,12 +963,12 @@ msgstr ""
 "podany\n"
 "plik to -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Wybór komunikatów:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -981,7 +976,7 @@ msgstr ""
 "      --translated            zachowanie przet³umaczonych, usuniêcie nie\n"
 "                                przet³umaczonych\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -989,64 +984,64 @@ msgstr ""
 "      --untranslated          zachowanie nie przet³umaczonych, usuniêcie\n"
 "                                przet³umaczonych\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              usuniêcie komunikatów oznaczonych 'fuzzy'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            zachowanie komunikatów oznaczonych 'fuzzy'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 "      --no-obsolete           usuniêcie przestarza³ych komunikatów #~\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         zachowanie przestarza³ych komunikatów #~\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulowanie atrybutami:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             oznaczenie wszystkich komunikatów jako "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           oznaczenie wszystkich komunikatów jako\n"
 "                                nie-'fuzzy'\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          oznaczenie wszystkich komunikatów jako\n"
 "                                przestarza³e\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        oznaczenie wszystkich komunikatów jako nie\n"
 "                                przestarza³e\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1055,14 +1050,14 @@ msgstr ""
 "      --clear-previous        usuniêcie \"previous msgid\" z wszystkich "
 "komunikatów\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=PLIK.po     modyfikacja tylko wpisów obecnych w PLIKU.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1070,36 +1065,36 @@ msgstr ""
 "      --ignore-file=PLIK.po   modyfikacja tylko wpisów nie obecnych w PLIKU."
 "po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonim dla --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonim dla --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sk³adnia pliku wej¶ciowego:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      plik wej¶ciowy ma sk³adniê .properties Javy\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1108,17 +1103,43 @@ msgstr ""
 "      --stringtable-input     plik wej¶ciowy ma sk³adniê .string z\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Szczegó³y dotycz±ce wyj¶cia:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 u¿ywanie zawsze kolorów i innych atrybutów "
+"tekstu\n"
+"      --color=WARUNEK         u¿ywanie kolorów i innych atrybutów je¿eli\n"
+"                              zachodzi WARUNEK, który mo¿e mieæ warto¶ci:\n"
+"                              'always' (zawsze), 'never' (nigdy), 'auto' "
+"albo\n"
+"                              'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=PLIKSTYLU       podanie pliku regu³ CSS dla opcji --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1126,9 +1147,9 @@ msgstr ""
 "  -e, --no-escape             nie u¿ywanie sekwencji C na wyj¶ciu "
 "(domy¶lne)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1136,37 +1157,37 @@ msgstr ""
 "  -E, --escape                u¿ywanie sekwencji C, bez znaków "
 "rozszerzonych\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              zapisanie pliku PO nawet je¶li jest pusty\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapisanie pliku .po w stylu z wciêciami\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nie zapisywanie linii '#: plik:linia'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generowanie linii '#: plik:linia' (domy¶lne)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1174,33 +1195,33 @@ msgstr ""
 "      --strict                zapisanie pliku .po ¶ci¶le zgodnego z "
 "Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapisanie pliku .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=LICZBA          ustawienie szeroko¶ci strony dla wyj¶cia\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1210,32 +1231,32 @@ msgstr ""
 "d³u¿szych\n"
 "                                ni¿ szeroko¶æ strony\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generowanie posortowanego wyj¶cia\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sortowanie wyj¶cia wed³ug po³o¿enia pliku\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "podane niemo¿liwe kryteria selekcji (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Sk³adnia: %s [OPCJA] [PLIK-WEJ¦CIOWY]\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1258,24 +1279,24 @@ msgstr ""
 "tylko z pierwszego definiuj±cego je pliku PO. Pozycje w plikach dla wszystkich\n"
 "plików PO zostan± zgromadzone.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  PLIK-WEJ¦CIOWY ...          pliki wej¶ciowe\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=PLIK       odczytanie listy plików wej¶ciowych z PLIKU\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Je¶li plik wej¶ciowy to -, czytane jest standardowe wej¶cie.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1285,7 +1306,7 @@ msgstr ""
 "                                mniejsz± od LICZBY, domy¶lnie "
 "nieskoñczono¶ci\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1294,7 +1315,7 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczb± definicji\n"
 "                                wiêksz± od LICZBY, domy¶lnie 1\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1303,8 +1324,8 @@ msgstr ""
 "  -u, --unique                skrót dla --less-than=2, ¿±danie wypisania\n"
 "                                wy³±cznie unikalnych komunikatów\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1312,8 +1333,8 @@ msgstr ""
 "  -P, --properties-input      pliki wej¶ciowe maj± sk³adniê .properties "
 "Javy\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1322,12 +1343,12 @@ msgstr ""
 "      --stringtable-input     pliki wej¶ciowe maj± sk³adniê .strings\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAZWA         kodowanie dla wyj¶cia\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1336,49 +1357,33 @@ msgstr ""
 "      --use-first             u¿ycie pierwszego dostêpnego t³umaczenia dla\n"
 "                                ka¿dego komunikatu zamiast ³±czenia wielu\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --color                 u¿ywanie zawsze kolorów i innych atrybutów "
-"tekstu\n"
-"      --color=WARUNEK         u¿ywanie kolorów i innych atrybutów je¿eli\n"
-"                              zachodzi WARUNEK, który mo¿e mieæ warto¶ci:\n"
-"                              'always' (zawsze), 'never' (nigdy), 'auto' "
-"albo\n"
-"                              'html'.\n"
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=PLIKSTYLU       podanie pliku regu³ CSS dla opcji --color\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "nie podano plików wej¶ciowych"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "wymagane s± dok³adnie dwa pliki wej¶ciowe"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Sk³adnia: %s [OPCJA] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1396,22 +1401,22 @@ msgstr ""
 "dopasowaæ dok³adnie, u¿ywane jest dopasowywanie rozmyte dla lepszej\n"
 "diagnostyki.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      t³umaczenia\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odniesienia do ¼róde³\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modyfikatory operacji:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1420,50 +1425,55 @@ msgstr ""
 "  -m, --multi-domain          zastosowanie ref.pot dla wszystkich domen def."
 "po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     nie u¿ywanie dopasowywania rozmytego\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "      --use-fuzzy             u¿ycie na wyj¶ciu niepewnych (fuzzy) "
 "komunikatów\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --use-untranslated      u¿ycie nie przet³umaczonych komunikatów\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "uwaga: ten komunikat nie jest przet³umaczony"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "ten komunikat powinien byæ sprawdzony przez t³umacza"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale ta definicja jest podobna"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ten komunikat jest u¿yty, ale nie zdefiniowany w %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "uwaga: ten komunikat nie jest u¿yty"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1471,12 +1481,12 @@ msgstr[0] "znaleziono %d b
 msgstr[1] "znaleziono %d b³êdy krytyczne"
 msgstr[2] "znaleziono %d b³êdów krytycznych"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musz± byæ podane przynajmniej dwa pliki"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1496,7 +1506,7 @@ msgstr ""
 "zachowane, ale tylko z pierwszego definiuj±cego je pliku PO. Pozycje w plikach\n"
 "dla wszystkich plików PO zostan± zgromadzone.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1505,7 +1515,7 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczb± definicji\n"
 "                                wiêksz± od LICZBY, domy¶lnie 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1513,65 +1523,65 @@ msgstr ""
 "      --omit-header           nie zapisywanie nag³ówka z wpisem `msgid "
 "\"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konwersja katalogu t³umaczeñ na inne kodowanie znaków.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cel konwersji:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Domy¶lnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 "  -i, --indent                zapisanie pliku .po w stylu z wciêciami\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           pominiêcie linii '#: plik:linia'\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          zachowanie linii '#: plik:linia' (domy¶lne)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                zapisanie pliku .po ¶ci¶le zgodnego z "
 "Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nie podano nazwy pliku wej¶ciowego"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "wymagany jest dok³adnie jeden plik wej¶ciowy"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Sk³adnia: %s [OPCJA] PLIK-WEJ¦CIOWY\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1584,22 +1594,22 @@ msgstr ""
 "xgettext). Nie przet³umaczonym wpisom s± przypisywane t³umaczenia identyczne\n"
 "z msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  PLIK-WEJ¦CIOWY              plik wej¶ciowy PO lub POT\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "brak nazwy polecenia"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Sk³adnia: %s [OPCJA] POLECENIE [OPCJA-POLECENIA]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1614,7 +1624,7 @@ msgstr ""
 "Jego wyj¶cie staje siê wyj¶ciem msgexec. Kod wyj¶cia msgexec to maksimum\n"
 "z kodów wyj¶cia dla wszystkich wywo³añ.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1623,43 +1633,43 @@ msgstr ""
 "Specjalne wbudowane polecenie o nazwie '0' wypisuje t³umaczenie zakoñczone\n"
 "bajtem 0. Wyj¶cie \"msgexec 0\" mo¿e byæ wej¶ciem dla \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=PLIK-WEJ¦CIOWY  plik wej¶ciowy PO\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "pisanie na standardowe wyj¶cie nie powiod³o siê"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "pisanie do podprocesu %s nie powiod³o siê"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "brak nazwy filtru"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musi byæ podany przynajmniej jeden skrypt seda"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Sk³adnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Zastosowanie filtru na wszystkich t³umaczeniach z katalogu t³umaczeñ.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1668,19 +1678,19 @@ msgstr ""
 "FILTR mo¿e byæ dowolnym programem czytaj±cym t³umaczenie ze standardowego\n"
 "wej¶cia i wypisuj±cym zmodyfikowane t³umaczenie na standardowym wyj¶ciu.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Przydatne OPCJE-FILTRA je¶li FILTREM jest 'sed':\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expresion=SKRYPT      dodanie SKRYPTU do wykonywanych poleceñ\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1691,13 +1701,13 @@ msgstr ""
 "wykonywanych\n"
 "                                poleceñ\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       nie wypisywanie zawarto¶ci wzorca\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1705,80 +1715,62 @@ msgstr ""
 "      --no-escape             nie u¿ywanie sekwencji C na wyj¶ciu "
 "(domy¶lne)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                zapisanie pliku w stylu z wciêciami\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           zachowanie nag³ówka z pominiêciem filtra\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Jeszcze nie zaimplementowane."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "nie mo¿na ustawiæ nieblokuj±cego we/wy dla podprocesu %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikacja z podprocesem %s nie powiod³a siê"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "czytanie z podprocesu %s nie powiod³o siê"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "podproces %s zakoñczony z kodem wyj¶cia %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument dla %s powinien byæ pojedynczym znakiem przestankowym"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "b³êdna endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s wymaga podania \"-d katalog\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s wymaga podania \"-l lokalizacja\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s jest prawid³owe tylko z %s lub %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s jest prawid³owe tylko z %s, %s albo z %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1786,7 +1778,7 @@ msgstr[0] "%d przet
 msgstr[1] "%d przet³umaczone komunikaty"
 msgstr[2] "%d przet³umaczonych komunikatów"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1794,7 +1786,7 @@ msgstr[0] ", %d t
 msgstr[1] ", %d t³umaczenia budz± w±tpliwo¶ci"
 msgstr[2] ", %d t³umaczeñ budzi w±tpliwo¶ci"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1802,18 +1794,18 @@ msgstr[0] ", %d nie przet
 msgstr[1] ", %d nie przet³umaczone komunikaty"
 msgstr[2] ", %d nie przet³umaczonych komunikatów"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Sk³adnia: %s [OPCJA] nazwa-pliku.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generowanie binarnego katalogu komunikatów z tekstowego opisu t³umaczeñ.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1822,17 +1814,17 @@ msgstr ""
 "Argumenty obowi±zkowe dla d³ugich opcji s± obowi±zkowe tak¿e dla krótkich.\n"
 "Podobnie dla argumentów opcjonalnych.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nazwa-pliku.po ...          pliki wej¶ciowe\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Tryb dzia³ania:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1841,7 +1833,7 @@ msgstr ""
 "  -j, --java                  tryb Javy: generowanie klas Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1849,12 +1841,12 @@ msgid ""
 msgstr ""
 "      --java2                 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1863,44 +1855,44 @@ msgstr ""
 "      --csharp-resources      tryb zasobów C#: generowanie pliku .resources ."
 "NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   tryb Tcl: generowanie pliku tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --qt                    tryb Qt: generowanie pliku .qm formatu Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                w³±czenie trybu ¶cis³ej zgodno¶ci z Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Je¶li plikiem wyj¶ciowym jest -, wynik jest kierowany na standardowe "
 "wyj¶cie.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Po³o¿enie pliku wyj¶ciowego w trybie Javy:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZASÓB        nazwa zasobu\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1908,14 +1900,14 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKALIZACJA    nazwa lokalizacji - jêzyk lub jêzyk_KRAJ\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d KATALOG                  bazowy katalog w hierarchii katalogu klas\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1928,12 +1920,12 @@ msgstr ""
 "Klasa\n"
 "jest zapisywana w podanym katalogu.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Po³o¿enie pliku wyj¶ciowego w trybie C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1942,7 +1934,7 @@ msgstr ""
 "  -d KATALOG                  katalog bazowy plików .dll zale¿nych od "
 "locale\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1952,18 +1944,18 @@ msgstr ""
 "podanego\n"
 "katalogu, którego nazwa zale¿y od locale.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Po³o¿enie pliku wyj¶ciowego w trybie Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  bazowy katalog katalogów komunikatów .msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1971,12 +1963,12 @@ msgid ""
 msgstr ""
 "Opcje -l i -d s± obowi±zkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacja pliku wej¶ciowego:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1987,14 +1979,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          sprawdzenie t³umaczeñ z formatów zale¿nych od\n"
 "                              jêzyka\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2003,7 +1995,7 @@ msgstr ""
 "      --check-header          sprawdzenie obecno¶ci i zawarto¶ci wpisu "
 "nag³ówka\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2012,7 +2004,7 @@ msgstr ""
 "      --check-domain          sprawdzenie konfliktów miêdzy dyrektywami\n"
 "                                dotycz±cymi domeny i opcj± --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2021,7 +2013,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrola czy GNU msgfmt dzia³a jak X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2032,13 +2024,13 @@ msgstr ""
 "klawiszowych\n"
 "                                dla opcji w menu\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             u¿ycie na wyj¶ciu niepewnych (fuzzy) wpisów\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2047,7 +2039,7 @@ msgstr ""
 "(domy¶lnie:\n"
 "                              %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2055,81 +2047,81 @@ msgstr ""
 "      --no-hash               tworzenie pliku binarnego bez tablicy "
 "haszuj±cej\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            wypisanie statystyk dotycz±cych t³umaczeñ\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               zwiêkszenie ilo¶ci podawanych informacji\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "uwaga: brakuj±cy lub niepoprawny nag³ówek pliku PO\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "uwaga: konwersja zestawu znaków nie bêdzie dzia³aæ\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uwaga: nag³ówek pliku PO jest niepewny (fuzzy)\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "uwaga: starsze wersje msgfmt nie zg³osz± b³êdu w tym miejscu\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nazwa domeny \"%s\" nie jest odpowiedni± nazwa pliku"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: u¿ycie przedrostka"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "dyrektywa `domain %s' zignorowana"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "zignorowana pusta warto¶æ `msgstr'"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "zignorowana niepewna (fuzzy) warto¶æ `msgstr'"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uwaga: plik ¼ród³owy zawiera t³umaczenie budz±ce w±tpliwo¶ci"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "b³±d w czasie czytania \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2137,7 +2129,7 @@ msgid ""
 msgstr ""
 "opcja '%c' nie mo¿e byæ u¿yta przed podaniem 'J', 'K', 'T', 'C' lub 'X'"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2146,7 +2138,7 @@ msgstr ""
 "Wyci±gniêcie z katalogu t³umaczeñ wszystkich komunikatów pasuj±cych do podanego\n"
 "wzorca lub nale¿±cych do podanego pliku ¼ród³owego.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2221,7 +2213,7 @@ msgstr ""
 "  -v, --invert-match          wypisanie tylko komunikatów, które nie pasuj± do\n"
 "                              kryteriów wyboru\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2229,18 +2221,18 @@ msgstr ""
 "      --escape                u¿ywanie sekwencji C, bez znaków "
 "rozszerzonych\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generowanie posortowanego wyj¶cia\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          sortowanie wyj¶cia wed³ug po³o¿enia pliku\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2250,7 +2242,7 @@ msgstr ""
 "¶rodowiskow± LANG zgodnie z opisem w pliku ABOUT-NLS. Jest to\n"
 "niezbêdne do testowania t³umaczeñ.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2261,12 +2253,12 @@ msgstr ""
 "Proszê podaæ lokalizacjê za pomoc± opcji --locale lub plik\n"
 "wyj¶ciowy .po za pomoc± opcji --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Utworzono %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2275,12 +2267,12 @@ msgstr ""
 "Stworzenie nowego pliku PO, inicjalizuj±c meta-informacje warto¶ciami ze\n"
 "¶rodowiska u¿ytkownika.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input-PLIK-WEJ¦CIOWY  plik wej¶ciowy POT\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2291,12 +2283,12 @@ msgstr ""
 "katalogu.\n"
 "Je¶li plik to -, czytane jest standardowe wej¶cie.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=PLIK      zapisanie wyniku do podanego pliku PO\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2306,12 +2298,12 @@ msgstr ""
 "ustawieñ lokalizacji u¿ytkownika. Je¶li plik to -, wyniki s± wypisywane na\n"
 "standardowym wyj¶ciu.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=JJ_KK          ustawienie docelowej lokalizacji\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2319,7 +2311,7 @@ msgstr ""
 "      --no-translator         uznanie, ¿e plik PO jest generowany "
 "automatycznie\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2327,12 +2319,12 @@ msgstr ""
 "Znaleziono wiêcej ni¿ jeden plik .pot.\n"
 "Proszê podaæ plik .pot za pomoc± opcji --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "b³±d podczas czytania bie¿±cego katalogu"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2340,14 +2332,14 @@ msgstr ""
 "Nie znaleziono pliku .pot w katalogu bie¿±cym.\n"
 "Proszê podaæ plik .pot za pomoc± opcji --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zawiód³ z kodem wyj¶cia %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2363,29 +2355,29 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Polskie t³umaczenia dla pakietu %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktualny zestaw znaków \"%s\" nie jest przeno¶n± nazw± kodowania"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dwa ró¿ne zestawy znaków \"%s\" oraz \"%s\" w pliku wej¶ciowym"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "plik wej¶ciowy `%s' nie zawiera wpisu nag³ówka ze specyfikacj± zestawu znaków"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2394,19 +2386,19 @@ msgstr ""
 "domena \"%s\" w pliku wej¶ciowym `%s' nie zawiera wpisu nag³ówka ze "
 "specyfikacj± zestawu znaków"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "docelowy zestaw znaków \"%s\" nie jest przeno¶n± nazw± kodowania."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "uwaga: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2415,7 +2407,7 @@ msgstr ""
 "Pliki wej¶ciowe zawieraj± komunikaty w ró¿nych kodowaniach, w tym UTF-8.\n"
 "Konwersja wyj¶cia do UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2427,7 +2419,7 @@ msgstr ""
 "Konwersja wyj¶cia do UTF-8.\n"
 "Aby wybraæ inne kodowanie wyj¶ciowe, nale¿y u¿yæ opcji --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2441,7 +2433,7 @@ msgstr ""
 "w ASCII albo upewnij siê, ¿e s± od pocz±tku, ju¿ w plikach ¼ród³ówych,\n"
 "zakodowane w UTF-8.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2454,12 +2446,12 @@ msgstr ""
 "Wyj¶cie '%s' mo¿e byæ niepoprawne.\n"
 "Mo¿liwe obej¶cia problemu to:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Ustawienie LC_ALL na lokalizacjê z kodowaniem %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2470,7 +2462,7 @@ msgstr ""
 "  a nastêpnie wykonanie '%s',\n"
 "  a nastêpnie przekonwertowanie z powrotem do %s przy u¿yciu 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2483,7 +2475,7 @@ msgstr ""
 "  a nastêpnie wykonanie '%s',\n"
 "  a nastêpnie przekonwertowanie z powrotem do %s przy u¿yciu 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2494,27 +2486,27 @@ msgstr ""
 "Wyj¶cie '%s' mo¿e byæ niepoprawne.\n"
 "Mo¿liwym obej¶ciem problemu jest ustawienie LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "wyra¿enie do wyliczania liczby mnogiej mo¿e zwróciæ warto¶ci ujemne"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale wyra¿enie do wyliczania liczby mnogiej mo¿e zwróciæ "
 "warto¶ci do %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 "wyra¿enie do wyliczania liczby mnogiej mo¿e spowodowaæ dzielenie przez zero"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "wyra¿enie do wyliczania liczby mnogiej mo¿e spowodowaæ przepe³nienie"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2522,37 +2514,37 @@ msgstr ""
 "wyra¿enie do wyliczania liczby mnogiej mo¿e spowodowaæ wyj±tki, mo¿liwe "
 "dzielenie przez zero"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Proszê spróbowaæ tego, poprawnego dla %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog komunikatów zawiera t³umaczenia form mnogich"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ale wpis nag³ówka nie ma atrybutu \"plural=WYRA¯ENIE\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ale wpis nag³ówka nie ma atrybutu \"nplurals=LICZBA\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "b³êdna warto¶æ nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "b³êdne wyra¿enie do wyliczania liczby mnogiej"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2560,7 +2552,7 @@ msgstr[0] "ale niekt
 msgstr[1] "ale niektóre komunikaty maj± tylko %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty maj± tylko %lu form mnogich"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2568,7 +2560,7 @@ msgstr[0] "ale niekt
 msgstr[1] "ale niektóre komunikaty maj± %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty maj± %lu form mnogich"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2576,82 +2568,82 @@ msgstr ""
 "katalog komunikatów zawiera t³umaczenia form mnogich, ale brakuje wpisu "
 "nag³ówka z \"Plural-Forms: nplurals=LICZBA; plural=WYRA¯ENIE;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgid_plural' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgstr[%u]' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "linie `msgid' i `msgstr' nie zaczynaj± siê obie od '\\n'`"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgid_plural' nie koñcz± siê obie na '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgstr[%u]' nie koñcz± siê obie na '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "linie `msgid' i `msgstr' nie koñcz± siê obie na '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "obs³uga form mnogich jest rozszerzeniem gettexta GNU"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego '%c'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr zawiera zbyt du¿o oznaczeñ skrótów klawiszowych '%c'"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "w nag³ówku brakuje pola `%s'\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "pole nag³ówka `%s' powinno siê zaczynaæ na pocz±tku linii\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "niektóre pola nag³ówka nadal zawieraj± pocz±tkowe warto¶ci domy¶lne\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: dane wej¶ciowe s± b³êdne je¿eli kodowanie to \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: b³±d w czasie zamiany kodowania z \"%s\" na \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "plik wej¶ciowy nie zawiera wpisu nag³ówka ze specyfikacj± zestawu znaków"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2660,7 +2652,7 @@ msgstr ""
 "Nie mo¿na przekonwertowaæ z \"%s\" do \"%s\". %s opiera siê na iconv(), a "
 "iconv() nie obs³uguje tej konwersji."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2669,8 +2661,8 @@ msgstr ""
 "Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre ró¿ni±ce siê "
 "msgid staj± siê identyczne."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2679,16 +2671,16 @@ msgstr ""
 "Nie mo¿na przekonwertowaæ z \"%s\" do \"%s\". %s opiera siê na iconv(). Ta "
 "wersja zosta³a zbudowana bez iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s jest prawid³owe tylko z %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "typ zapasowy"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2710,18 +2702,18 @@ msgstr ""
 "kropk± i pozycje w plikach bêd± zachowane. Tam, gdzie nie mo¿na dopasowaæ\n"
 "dok³adnie, u¿ywane jest dopasowanie rozmyte, dla lepszych wyników.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      t³umaczenia odnosz±ce siê do starych ¼róde³\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odniesienia do nowych ¼róde³\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2730,7 +2722,7 @@ msgstr ""
 "  -C, --compendium=PLIK       dodatkowa biblioteka t³umaczeñ komunikatów,\n"
 "                                mo¿e byæ podana wiêcej ni¿ raz\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2739,28 +2731,28 @@ msgstr ""
 "  -U, --update                uaktualnienie def.po, nie wykonywanie\n"
 "                                niczego je¶li def.po jest ju¿ aktualny\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Po³o¿enie pliku wyj¶ciowego w trybie uaktualniania:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Wynik jest zapisywany z powrotem do def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROLA       utworzenie kopii zapasowej def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=KOÑCÓWKA       zmiana domy¶lnej koñcówki kopii zapasowej\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2780,7 +2772,7 @@ msgstr ""
 "  existing, nil   numerowanie je¶li istniej± numerowane, proste je¶li nie\n"
 "  simple, never   tworzenie zawsze prostych kopii zapasowych\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2790,12 +2782,7 @@ msgstr ""
 "Koñcówka kopii zapasowej to `~', o ile nie ustawiono przez --suffix lub\n"
 "zmienn± ¶rodowiskow± SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     nie u¿ywanie dopasowywania rozmytego\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2803,22 +2790,22 @@ msgstr ""
 "      --previous              zachowanie poprzednich identyfikatorów\n"
 "                                przet³umaczonych komunikatów\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       pominiêcie znaczników postêpu\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ten komunikat powinien definiowaæ formy mnogie"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ten komunikat nie powinien definiowaæ form mnogich"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2827,28 +2814,30 @@ msgstr ""
 "%sPrzeczytane %ld starych + %ld odno¶ników, %ld do³±czonych, %ld "
 "niedok³adnych, %ld brakuj±cych, %ld przestarza³ych.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " zrobione.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s i podanie nazw plików wzajemnie siê wykluczaj±"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Sk³adnia: %s [OPCJA] [PLIK]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Przekonwertowanie binarnego katalogu komunikatów na plik .po w stylu "
 "Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2857,12 +2846,12 @@ msgstr ""
 "  -j, --java                  tryb Javy: wej¶cie jest klas± Java "
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                tryb C#: wynik jest plikiem .dll .NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2871,7 +2860,7 @@ msgstr ""
 "      --csharp-resources      tryb zasobów C#: na wej¶ciu plik .resources ."
 "NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2879,17 +2868,17 @@ msgstr ""
 "      --tcl                   tryb Tcl: wej¶cie jest plikiem tcl/msgcat ."
 "msg\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  PLIK ...                    pliki wej¶ciowe .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Po³o¿enie pliku wej¶ciowego w trybie Javy:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2901,12 +2890,12 @@ msgstr ""
 "u¿yciu\n"
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Po³o¿enie pliku wej¶ciowego w trybie C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2915,12 +2904,12 @@ msgstr ""
 "Opcje -l i -d s± obowi±zkowe. Plik .dll znajduje siê w podkatalogu podanego\n"
 "katalogu, którego nazwa zale¿y od locale.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Po³o¿enie pliku wej¶ciowego w trybie Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2928,18 +2917,18 @@ msgid ""
 msgstr ""
 "Opcje -l i -d s± obowi±zkowe. Plik .msg jest szukany w podanym katalogu.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                zapisanie pliku w stylu z wciêciami\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                zapisanie pliku ¶ci¶le zgodnego z Uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2961,12 +2950,12 @@ msgstr ""
 "w plikach zostan± zgromadzone. W przypadku u¿ycia opcji --unique, duplikaty\n"
 "zostan± usuniête.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              wypisanie tylko duplikatów\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2974,7 +2963,7 @@ msgid ""
 msgstr ""
 "  -u, --unique                wypisanie tylko unikalnych, bez duplikatów\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<standardowe wej¶cie>"
@@ -3060,65 +3049,65 @@ msgstr "pierwsza forma mnoga ma niezerowy indeks"
 msgid "plural form has wrong index"
 msgstr "forma mnoga ma z³y indeks"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "za du¿o b³êdów, przerwanie wykonywania"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "b³êdna sekwencja wielobajtowa"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "niekompletna sekwencja wielobajtowa na koñcu pliku"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "niekompletna sekwencja wielobajtowa na koñcu linii"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv zawiód³"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nieznane s³owo kluczowe \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "b³êdna sekwencja steruj±ca"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "znak koñca pliku wewn±trz napisu"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "znak koñca wiersza wewn±trz napisu"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "separator kontekstu <EOT> wewn±trz napisu"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ten plik nie mo¿e zawieraæ dyrektyw domain"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "podwójna definicja komunikatu"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "to jest po³o¿enie pierwszej definicji"
 
@@ -3203,17 +3192,17 @@ msgstr "dane wej
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "b³±d w czasie zmiany kodowania z \"%s\" na \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "oczekiwano dwóch argumentów"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Sk³adnia: %s [OPCJA] URL PLIK\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3222,11 +3211,26 @@ msgstr ""
 "Pobranie i wypisanie zawarto¶ci URL-a. Je¶li URL jest niedostêpny, u¿ywany jest\n"
 "lokalnie dostêpny PLIK.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "b³±d podczas pisania na standardowe wyj¶cie"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3268,42 +3272,42 @@ msgid ""
 msgstr ""
 "katalog komunikatów ma formy mnogie, ale nie mog± byæ zapisane na wyj¶ciu."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standardowe wyj¶cie"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "nie uda³o siê utworzyæ katalogu \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilacja klasy C# nie uda³a siê, proszê u¿yæ --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilacja klasy C# nie uda³a siê"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "niepoprawna nazwa klasy Javy: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilacja klasy Javy nie uda³a siê, proszê u¿yæ --verbose lub ustawiæ $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilacja klasy Javy nie uda³a siê, proszê ustawiæ $JAVAC"
@@ -3313,13 +3317,13 @@ msgstr "kompilacja klasy Javy nie uda
 msgid "error while opening \"%s\" for writing"
 msgstr "b³±d otwarcia \"%s\" do pisania"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "umiêdzynaradawiane komunikaty nie powinny zawieraæ sekwencji `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3332,7 +3336,7 @@ msgstr ""
 "innego ni¿ ty. Rozwa¿ u¿ywanie w nazwach msgctxt wy³±cznie znaków ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3355,8 +3359,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3379,7 +3383,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "b³±d podczas pisania do podprocesu %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3387,7 +3391,7 @@ msgstr ""
 "katalog komunikatów ma t³umaczenia zale¿ne od kontekstu,\n"
 "ale format C# .resources nie pozwala u¿ywaæ kontekstów\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3411,36 +3415,34 @@ msgstr ""
 "katalog komunikatów zawiera t³umaczenia form mnogich,\n"
 "ale format katalogu komunikatów Tcl-a nie obs³uguje liczby mnogiej\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uwaga: niezakoñczony napis"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uwaga: niezakoñczone wyra¿enie regularne"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezakoñczona sta³a ³añcuchowa"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "£añcuch nie-ASCII w %s%s.\n"
 "Proszê podaæ kodowanie ¼ród³a przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3449,7 +3451,7 @@ msgstr ""
 "%s:%d: B³êdna sekwensja wielobajtowa.\n"
 "Proszê podaæ poprawne kodowanie ¼ród³owe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3458,7 +3460,7 @@ msgstr ""
 "%s:%d: Niekompletna d³uga sekwencja wielobajtowa.\n"
 "Proszê podaæ prawid³owe kodowanie ¼ród³owe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3467,7 +3469,7 @@ msgstr ""
 "%s:%d: Niekompletna sekwencja wielobajtowa na koñcu pliku.\n"
 "Proszê podaæ prawid³owe kodowanie ¼ród³owe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3476,12 +3478,12 @@ msgstr ""
 "%s:%d: Niekompletna sekwencja wielobajtowa na koñcu linii.\n"
 "Proszê podaæ prawid³owe kodowanie ¼ród³owe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: b³±d iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3490,32 +3492,32 @@ msgstr ""
 "%s:%d: Nieprawid³owa sekwencja wielobajtowa.\n"
 "Proszê podaæ prawid³owe kodowanie ¼ród³owe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uwaga: b³êdny znak unikodowy"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uwaga: niezakoñczona sta³a znakowa"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uwaga: znaleziono ')', oczekiwano '}'"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uwaga: znaleziono '}', oczekiwano ')'"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3524,50 +3526,49 @@ msgstr ""
 "Jêzyk \"glade\" nie jest obs³ugiwany. %s polega na expat.\n"
 "Ta wersja zosta³a skompilowana bez expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: uwaga: niezakoñczony napis U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: nie mo¿na znale¼æ koñca napisu \"%s\" przez koñcem pliku"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: brakuj±cy prawy nawias w \\x{LICZBA_SZESNASTKOWA}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: b³êdna interpolacja (\"\\l\") 8-bitowego znaku \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: b³êdna interpolacja (\"\\u\") 8-bitowego znaku \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: b³êdna interpolacja zmiennej w \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: b³êdna interpolacja (\"\\L\") 8-bitowego znaku \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: b³êdna interpolacja (\"\\U\") 8-bitowego znaku \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3575,7 +3576,7 @@ msgstr ""
 "Proszê podaæ kodowanie ¼ród³a przy pomocy --from-code albo przez komentarz\n"
 "wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3586,7 +3587,7 @@ msgstr ""
 "Proszê podaæ poprawne kodowanie ¼ród³owe przy pomocy --from-code albo przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3598,7 +3599,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3610,7 +3611,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3622,7 +3623,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3634,27 +3635,27 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Nieznane kodowanie \"%s\". U¿yte bêdzie kodowanie ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: b³êdna definicja napisu"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: brakuj±ca liczba po #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: b³êdne wyra¿enie napisowe"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3663,28 +3664,28 @@ msgstr ""
 "%s:%lu: uwaga: sk³adnia $\"...\" nie jest u¿ywana ze wzglêdu na "
 "bezpieczeñstwo; u¿yj eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nie mo¿e byæ u¿yte przy pisaniu na standardowe wyj¶cie"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nie mo¿e dzia³aæ bez podania s³ów kluczowych"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uwaga: typ pliku `%s' z rozszerzeniem `%s' jest nieznany; spróbujê C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Wyci±gniêcie przet³umaczalnych napisów z podanych plików wej¶ciowych.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3692,24 +3693,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAZWA  u¿ycie NAZWA.po (nie messages.po) dla wyj¶cia\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=PLIK           zapisanie wyniku do podanego pliku\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=KATALOG    umieszczenie plików wyj¶ciowych w KATALOGU\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wybór jêzyka pliku wej¶ciowego:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3728,12 +3729,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3741,7 +3742,7 @@ msgid ""
 msgstr ""
 "Domy¶lnie jêzyk jest zgadywany na podstawie rozszerzenia pliku wej¶ciowego.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3750,27 +3751,30 @@ msgstr ""
 "      --from-code=NAZWA       kodowanie plików wej¶ciowych\n"
 "                                (oprócz Pythona, Tcl-a, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Domy¶lnie zak³ada siê, ¿e pliki wej¶ciowe s± w ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         do³±czenie komunikatów do istniej±cego pliku\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=PLIK.po  pominiêcie wpisów z PLIKU.po\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ZNACZNIK]  umieszczenie bloków komentarza ze "
 "ZNACZNIKIEM\n"
@@ -3778,17 +3782,17 @@ msgstr ""
 "kluczowym)\n"
 "                                w pliku wyj¶ciowym\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcje specyficzne dla jêzyka:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           wyci±gniêcie wszystkich napisów\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3801,16 +3805,16 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=S£OWO]       dodatkowe s³owo kluczowe do poszukiwania\n"
 "                                (bez S£OWA oznacza nie u¿ywanie domy¶lnych)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3821,7 +3825,7 @@ msgstr ""
 "numer\n"
 "                              ARG s³owa kluczowego S£OWO\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3834,38 +3838,38 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             przetwarzanie na wej¶ciu trójznaków ANSI C\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (tylko jêzyki C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozpoznawanie napisów w formacie Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (tylko jêzyk C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozpoznawanie napisów w formacie KDE 4\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3873,18 +3877,18 @@ msgstr ""
 "      --debug                 wiêcej szczegó³ów o rozpoznawaniu formatów\n"
 "                              napisów\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=NAPIS    wypisanie w³a¶ciciela praw autorskich\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3892,61 +3896,78 @@ msgstr ""
 "      --foreign-user          pominiêcie na wyj¶ciu copyrightu FSF dla\n"
 "                                zewnêtrznych projektów\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKIET   podanie nazwy PAKIETU na wyj¶ciu\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=WERSJA    podanie na wyj¶ciu WERSJI pakietu\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=ADRES@EMAIL  adres do zg³aszania b³êdów w msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=NAPIS]    u¿ycie NAPISU lub \"\" jako przedrostka "
 "wpisów\n"
 "                                   msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=NAPIS]    u¿ycie NAPISU lub \"\" jako przyrostka "
 "wpisów\n"
 "                                   msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Argument opcji --flag nie ma sk³adni <keyword>:<argnum>:[pass-]<flag>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardowe wej¶cie"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uwaga: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3955,16 +3976,16 @@ msgstr ""
 "Chocia¿ %s jest u¿yte w formacie po³o¿enia napisu, %s nie jest prawid³owym "
 "formatem. Powód: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "%s nie jest prawid³owym formatem napisu %s, mimo ¿e jest tak zadeklarowany. "
 "Powód: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3978,7 +3999,7 @@ msgstr ""
 "Rozwa¿ u¿ycie formatu z nazwami argumentów i mapowania zamiast\n"
 "zestawu argumentów.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3988,27 +4009,27 @@ msgstr ""
 "gettext(\"\") zwraca wpis nag³ówka z meta-informacjami,\n"
 "a nie pusty napis.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "niejednoznaczna specyfikacja argumentu s³owa kluczowego '%.*s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uwaga: brak kontekstu s³owa kluczowego '%.*s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uwaga: brak kontekstu dla mnogiego argumentu s³owa kluczowego '%.*s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "pomieszanie kontekstów miêdzy form± pojedyñcz± i mnog±"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4020,7 +4041,7 @@ msgstr ""
 "zmienn± MSGID_BUGS_ADDRESS; w przeciwnym wypadku proszê\n"
 "podaæ opcjê --msgid-bugs-address z linii poleceñ.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "nieznany jêzyk `%s'"
@@ -4028,3 +4049,27 @@ msgstr "nieznany j
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<nienazwany>"
+
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: niedozwolona opcja -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "b³±d DuplicateHandle, kod 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Jeszcze nie zaimplementowane."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "nie mo¿na ustawiæ nieblokuj±cego we/wy dla podprocesu %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "komunikacja z podprocesem %s nie powiod³a siê"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "czytanie z podprocesu %s nie powiod³o siê"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "podproces %s zakoñczony z kodem wyj¶cia %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "pole `%s' ma nadal pocz±tkow± warto¶æ domy¶ln±\n"

diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index 266c062dac93689994daa0a7861f797ef5d99a27..f5c1389bc75a7bfb39ba8ca402c6123edff95c2a 100644 (file)
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,22 +30,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "impossível criar o ficheiro de saída \"%s\""
@@ -53,44 +54,44 @@ msgstr "imposs
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -100,74 +101,73 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: a opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: a opção `--%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: a opção `%c%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: a opção `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opção ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, 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:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, 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 permite um argumento\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: a opção `%s' requere um argumento\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -179,20 +179,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -202,20 +202,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "memória exausta"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -234,70 +234,69 @@ msgstr "imposs
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "impossível criar o ficheiro de saída \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-boost.c:449
@@ -322,9 +321,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -364,48 +363,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -497,19 +496,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -523,11 +521,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -575,12 +573,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-perl.c:433
@@ -590,54 +588,51 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -674,11 +669,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -687,38 +682,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -751,29 +746,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -782,11 +777,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
@@ -795,294 +790,312 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1104,31 +1117,31 @@ msgstr ""
 "  -V, --version               mostra a informação de versão e sai\n"
 "  -w, --width=NÚMERO          especifica a largura de página na saída\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1142,105 +1155,97 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ficheiros de entrada não fornecidos"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1267,80 +1272,85 @@ msgstr ""
 "é usado um emparelhamento aproximado para produzir melhores\n"
 "diagnósticos.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem é usada mas não definida..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta definição é semelhante"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1353,74 +1363,74 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "são necessários exactamente 2 ficheiros"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1429,22 +1439,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumentos insuficientes"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1454,67 +1464,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumentos insuficientes"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1522,207 +1532,189 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduções aproximadas"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1731,48 +1723,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1780,33 +1772,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1814,111 +1806,111 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome de domínio \"%s\" não apropriado como nome de ficheiro:\n"
 "prefixo usado"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domínio %s' ignorada"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, fuzzy, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1958,30 +1950,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1989,24 +1981,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2014,54 +2006,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2073,54 +2065,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2129,7 +2121,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2138,7 +2130,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2147,12 +2139,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2160,7 +2152,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2169,7 +2161,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2177,192 +2169,192 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "sequência de controlo ilegal"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é usada mas não definida em %s"
 msgstr[1] "esta mensagem é usada mas não definida em %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "o campo `%s' falta no cabeçalho"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "o campo `%s' do cabeçalho deve começar no início da linha"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2389,51 +2381,51 @@ msgstr ""
 "resultados serão escritos no canal de saída por defeito (stdout) a\n"
 "menos que seja especificado um ficheiro de saída.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2445,7 +2437,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2453,96 +2445,93 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem é usada mas não definida em %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam %"
-"d, obsoletas %d.\n"
+"%sLidas %d antigas + %d referências, combinadas %d, aproximadas %d, faltam "
+"%d, obsoletas %d.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr "terminado.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2550,41 +2539,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2597,19 +2586,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2686,65 +2675,65 @@ msgstr ""
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "demasiados erros, interrompendo"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "sequência de controlo ilegal"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "fim-de-ficheiro dentro da cadeia"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro não pode conter directivas de domínio"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definição de mensagem duplicada"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "este é o local da primeira definição"
 
@@ -2833,28 +2822,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "demasiados argumentos"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2886,41 +2890,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "canal de saída por defeito (stdout)"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2930,7 +2934,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -2938,7 +2942,7 @@ msgstr ""
 "as mensagens de internacionalização não devem conter\n"
 "a sequência de escape `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2947,7 +2951,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2964,8 +2968,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -2982,13 +2986,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3006,154 +3010,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opção ilegal -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3161,7 +3160,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3169,7 +3168,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3177,7 +3176,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3185,7 +3184,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3193,81 +3192,81 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usada quando a saída\n"
 "é escrita no stdout"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, fuzzy, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n"
 "será tentado C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3279,58 +3278,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3339,14 +3341,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3354,7 +3356,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3363,119 +3365,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3484,34 +3503,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3519,7 +3538,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
@@ -3528,6 +3547,13 @@ msgstr ""
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+
 #~ msgid "...this is the location of the first definition"
 #~ msgstr "...este é o local da primeira definição"
 
@@ -3845,8 +3871,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -3869,8 +3895,8 @@ msgstr ""
 #~ "Utilização: %s [OPÇÃO] ficheiro.po ...\n"
 #~ "Os argumentos obrigatórios para as opções longas são igualmente\n"
 #~ "obrigatórios para as opções curtas.\n"
-#~ "  -a, --alignment=NÚMERO      alinha as cadeias a NÚMERO bytes (defeito: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NÚMERO      alinha as cadeias a NÚMERO bytes (defeito: "
+#~ "%d)\n"
 #~ "  -c, --check                 executa testes dependentes da linguagem na\n"
 #~ "                              cadeia\n"
 #~ "  -D, --directory=DIRECTÓRIO  adiciona DIRECTÓRIO à lista de procura "

diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 763388676fb7060e345844ef8b459bb88feeb0e9..b45b18cdeace314ce83d3beae9e062269a7e1036 100644 (file)
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.36\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2001-04-03 08:25+02:00\n"
 "Last-Translator: Flávio Bruno Leitner <flavio@conectiva.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: 8bit\n"
@@ -32,22 +33,22 @@ msgstr ""
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "não foi possível criar o arquivo de saída \"%s\""
@@ -56,44 +57,44 @@ msgstr "n
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, fuzzy, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, fuzzy, c-format
 msgid "error reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, fuzzy, c-format
 msgid "error writing \"%s\""
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, fuzzy, c-format
 msgid "error after reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -103,74 +104,73 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opção `%s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opção `--%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opção `%c%s' não aceita parâmetros\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opção `%s' requer um argumento\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opção não reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opção não reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opção ilegal -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: opção inválida -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opção requer um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opção `-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opção `-W %s' não aceita parâmetros\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opção `%s' requer um argumento\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -182,20 +182,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -205,20 +205,20 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Memória insuficiente"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, fuzzy, c-format
 msgid "cannot create pipe"
@@ -237,70 +237,69 @@ msgstr "n
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "não foi possível criar o arquivo de saída \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #: src/format-boost.c:449
@@ -325,9 +324,9 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
@@ -368,48 +367,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -501,19 +500,18 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -527,11 +525,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -579,13 +577,13 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #: src/format-perl.c:433
@@ -595,56 +593,53 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "número de especificações de formatos em `msgid' e `msgstr' não conferem"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "especificações de formato para o argumento %lu são diferentes"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -681,11 +676,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -694,38 +689,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "excesso de parâmetros"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para maiores informações\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -758,29 +753,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -789,11 +784,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
@@ -803,294 +798,312 @@ msgstr "Reporte bugs para <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1110,31 +1123,31 @@ msgstr ""
 "  -V, --version            apresenta informações de versão e finaliza\n"
 "  -w, --width=NÚMERO       configura largura da página de saída\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "critério de seleção especificado impossível (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1164,105 +1177,97 @@ msgstr ""
 "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
 "os arquivos PO serão preservados.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "arquivos de entrada não informados"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1287,81 +1292,86 @@ msgstr ""
 "mensagens do programa foram traduzidas. Onde uma igualdade não puder ser\n"
 "encontrada uma aproximação é utilizada para produzir um melhor diagnóstico.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "esta mensagem é utilizada, mas não foi definida..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mas esta definição é similar"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrado %d erro fatal"
 msgstr[1] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1390,74 +1400,74 @@ msgstr ""
 "primeiro arquivo PO que os definirem. As posições de arquivo de todos\n"
 "os arquivos PO serão preservados.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "são necessários 2 arquivos de entrada"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1466,22 +1476,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "parâmetros não informados"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1491,67 +1501,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "parâmetros não informados"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1559,210 +1569,192 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagem traduzida"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d tradução aproximada (fuzzy)"
 msgstr[1] ", %d traduções aproximadas (fuzzy)"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagem não traduzida"
 msgstr[1] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1771,48 +1763,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1820,33 +1812,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1854,117 +1846,117 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: aviso: falta o cabeçalho relativo ao charset\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: aviso: Cabeçalho do arquivo PO esquecido, aproximado ou inválido\n"
 "%*s aviso: conversão de charset não vai funcionar"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
 "prefixo"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s': diretiva ignorada"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "`msgstr' vazia: mensagem ignorada"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "`msgstr' aproximada (fuzzy): mensagem ignorada"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2004,30 +1996,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2035,24 +2027,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2060,54 +2052,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2119,54 +2111,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, fuzzy, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "%s: aviso: charset \"%s\" não é suportado pelo iconv%s"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2175,7 +2167,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2184,7 +2176,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2193,12 +2185,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2206,7 +2198,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2215,7 +2207,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2223,188 +2215,188 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "seqüência de controle ilegal"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "esta mensagem é utilizada mas não definida em %s"
 msgstr[1] "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não começam com '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' e `msgstr' não começam com '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr[%u]' não terminam com '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' e `msgstr' não terminam com '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr "campo `%s' faltando no cabeçalho"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "campo `%s' deve iniciar no começo da linha"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "campo `%s' ainda possui o valor inicial"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "alguns campos do cabeçalho ainda possuem os valores iniciais padrões"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2429,51 +2421,51 @@ msgstr ""
 "Os resultados serão gravados na saída padrão, a menos que um arquivo de\n"
 "saída seja especificado.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2485,7 +2477,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2493,33 +2485,28 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "esta mensagem é utilizada mas não definida em %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2528,61 +2515,63 @@ msgstr ""
 "%sLido %ld antigas + %ld referência, concatenadas %ld, aproximadas %ld, "
 "perdidas %ld, obsoletas %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " feito.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2590,41 +2579,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2637,19 +2626,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2730,65 +2719,65 @@ msgstr "primeira forma em plural tem o 
 msgid "plural form has wrong index"
 msgstr "forma plural tem o índice errado"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "excesso de erros - finalizando"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "sequência multibyte inválido"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "seqüência de controle ilegal"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "fim de arquivo sem string"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "fim de linha sem string"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este arquivo parece não conter diretivas de domínio"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definição duplicada de mensagem"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...esta é a localização da primeira definição"
@@ -2878,28 +2867,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro ao abrir \"%s\" para leitura"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "excesso de parâmetros"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "erro ao gravar o arquivo \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2931,41 +2935,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "não foi possível criar o arquivo de saída \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "saída padrão"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -2975,14 +2979,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mensagens internacionalizadas não devem conter o caractere de escape `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2991,7 +2995,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3008,8 +3012,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3026,13 +3030,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "erro ao gravar o arquivo \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3050,154 +3054,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: caractere constante indeterminado"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: opção inválida -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3205,7 +3204,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3213,7 +3212,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3221,7 +3220,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3229,7 +3228,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3237,78 +3236,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: aviso: string literal indeterminada"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usado enquanto a saída é escrita na saída padrão"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext não pode funcionar sem as teclas para procurar"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "aviso: arquivo `%s' extensão `%s' é desconhecida; tentarei C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "não foi informado o arquivo de entrada"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3320,58 +3319,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3380,14 +3382,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:893
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3395,7 +3397,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3404,119 +3406,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrada padrão"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3525,34 +3544,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3560,7 +3579,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "idioma `%s' desconhecido"
@@ -3569,6 +3588,13 @@ msgstr "idioma `%s' desconhecido"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
+
+#, fuzzy
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "campo `%s' ainda possui o valor inicial"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -3736,8 +3762,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
@@ -3763,8 +3789,8 @@ msgstr ""
 #~ "\n"
 #~ "Parâmetros obrigatórios para opções longas são também obrigatórios\n"
 #~ "para as opções curtas\n"
-#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NÚMERO   alinha strings em um NÚMERO de bytes (padrão: "
+#~ "%d)\n"
 #~ "  -c, --check              executa conferências dependentes de linguagem "
 #~ "em strings\n"
 #~ "  -D, --directory=DIR      adiciona DIR para a lista de pesquisa de "

diff --git a/gettext-tools/po/ro.po b/gettext-tools/po/ro.po
index b1368e5e6211083cb00f66b89d4fd6d728365aa4..eda77e0c4e32fc127a252299127527184a54757a 100644 (file)
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2003-11-23 11:43+0200\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"
@@ -31,23 +32,23 @@ msgstr "parametru ambiguu `%s' pentru `%s'"
 msgid "Valid arguments are:"
 msgstr "Parametrii valizi sunt: "
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nu se poate gãsi un director temporar, încercaþi sã setaþi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "nu se poate crea un director temporar folosind modelul(template) \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr ""
@@ -57,44 +58,44 @@ msgstr ""
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "nu se poate deschide fiºierul de backup \"%s\" pentru scriere"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "eroare în citirea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "eroare în scrierea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "eroare dupã citirea lui \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() eºuat"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -108,74 +109,73 @@ msgstr ""
 "Nu a fost gãsitã maºina virtualã Java, încercaþi sã instalaþi gij sau sã "
 "setaþi $JAVA"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscutã"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprocesul %s a eºuat"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opþiunea `%s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `--%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: opþiune necunoscutã `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: opþiune necunoscutã `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opþiune ilegalã -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: optiune invalidã -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opþiunea necesitã un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opþiunea `-W %s' este ambiguã\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opþiunea `%s' necesitã un parametru\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -187,20 +187,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "eroare în crearea \"%s\""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "eroare în scrierea fiºierului \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -214,20 +214,20 @@ msgstr ""
 "Nu a fost gãsitã maºina virtualã Java, încercaþi sã instalaþi gij sau sã "
 "setaþi $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "eroare I/O a subprocesului %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plinã"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -246,73 +246,72 @@ msgstr "nu se poate crea leg
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle a eºuat cu cod de eroare 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a eºuat"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocesul %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subprocesul %s a primit semnalul fatal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' nu este un format valid de ºir %s, spre deosebire de 'msgid'. Motiv: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "o specificaþie de formatare pentru parametrul %u, ca în `%s', nu existã în "
 "'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "o specificaþie de format pentru argumentul %u nu existã în '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "specificaþiile de formatare din 'msgid' ºi '%s' pentru argumentul %u sunt "
 "diferite"
@@ -344,9 +343,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "ªirul are referire la argumentul numãrul %u dar ignorã argumentul numãrul %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "numãrul de specificaþii de formatare din 'msgid' ºi '%s' este diferit"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -390,18 +389,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "ªirul se terminã în mijlocul directivei."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -409,7 +408,7 @@ msgid ""
 msgstr ""
 "În directiva numãrul %u, numãrul de argument 0 nu este un întreg pozitiv."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -417,25 +416,25 @@ msgid ""
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -543,23 +542,22 @@ msgstr ""
 "'<', '#' sau '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "o specificaþie de formatare pentru argumentul {%u}, ca în '%s', nu existã în "
 "'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "o specificaþie de formatare pentru argumentul {%u} nu existã în '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "specificaþiile de format din 'msgid' ºi '%s' pentru argument {%u} nu sunt la "
 "fel"
@@ -577,11 +575,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, fuzzy, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "În directiva numãrul %u sunt furnizaþi prea mulþi parametri; se aºteptau cel "
 "mult %u parametrii."
@@ -634,13 +632,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "ªirul se referã la anumite argumente în moduri incompatibile."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "specificaþiile de format din 'msgid' ºi '%s' nu sunt echivalente"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "specificaþiile de format din '%s' nu sunt subset al acelora din 'msgid'"
 
@@ -653,12 +651,12 @@ msgstr ""
 "În directiva numãrul %u, specificatorul de mãrime este incompatibil cu "
 "specificatorul de conversie '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "o specificare de format pentru argumentul '%s' nu existã în '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -666,42 +664,39 @@ msgstr ""
 "ªirul se referã la argumente atât prin numele argumentelor cât ºi prin "
 "specificaþii de argument nenominalizate."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ªirul se referã la argumentul numit '%s' în moduri incompatibile."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "specificaþiile de format din 'msgid' aºteaptã o mapare, acelea din '%s' "
 "aºteaptã altceva(tuple)"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "specificaþiile de formatare din 'msgid' aºteaptã altceva (tuple), acelea din "
 "'%s' aºteaptã o mapare"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "specificarea de formatare pentru argumentul '%s', precum în '%s' nu existã "
 "în 'msgid'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "specificaþiile de formatare din 'msgid' ºi '%s' pentru argumentul '%s' nu "
 "sunt la fel"
@@ -709,8 +704,8 @@ msgstr ""
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -753,11 +748,11 @@ msgid ""
 msgstr ""
 "Caracterul care terminã directiva numãrul %u nu este un digit între 1 ºi 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -766,38 +761,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "prea mulþi parametri"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE]\n"
@@ -833,29 +828,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ieºire(output) informativã:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afiºeazã acest ajutor ºi iese\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afiºeazã informaþii despre versiune ºi iese\n"
@@ -864,11 +859,11 @@ msgstr "  -V, --version               afi
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raportaþi bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
@@ -877,30 +872,30 @@ msgstr "Raporta
 msgid "could not get host name"
 msgstr "nu s-a putut afla numele de host"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cel mult un fiºier de intrare(input) este permis"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ºi %s se exclud reciproc"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER_INTRARE]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -909,10 +904,10 @@ msgstr ""
 "Filtreazã mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "ºi manipuleazã atributele.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -920,23 +915,23 @@ msgstr ""
 "Parametrii obligatorii la opþiunile lungi sunt obligatorii ºi la opþiunile "
 "scurte.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locaþie fiºier intrare(input):\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FIªIER_INTRARE                   fiºier de intrare(input) PO\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -944,33 +939,33 @@ msgstr ""
 "  -D, --directory=DIRECTOR   adaugã DIRECTOR în lista de cãutare a "
 "fiºierelor de intrare\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Dacã nu este dat nici un fiºier de intrare sau este -, se va citi intrarea"
 "(input) standard.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locaþie fiºier ieºire(output):\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FIªIER      scrie output-ul în fiºierul specificat\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -980,12 +975,12 @@ msgstr ""
 "fiºier\n"
 "de ieºire(output) sau dacã acesta este -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecþie mesaje:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -993,7 +988,7 @@ msgstr ""
 "      --translated            pãstreazã pe cele traduse, ºterge mesajele "
 "netraduse\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1001,59 +996,59 @@ msgstr ""
 "      --untranslated          pãstreazã pe cele netraduse, ºterge mesajele "
 "traduse\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              ºterge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            pãstreazã mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ºterge mesajele învechite #~ \n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         pãstreazã mesajele învechite #~ \n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteazã toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteazã toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteazã toate mesajele învechite\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteazã toate mesajele non-învechite\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           seteazã toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1061,7 +1056,7 @@ msgstr ""
 "      --only-file=FIªIER.po     manipuleazã doar intrãrile listate în FIªIER."
 "po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1069,13 +1064,13 @@ msgstr ""
 "      --ignore-file=FIªIER.po   manipuleazã doar intrãrile nelistate în "
 "FIªIER.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1083,16 +1078,16 @@ msgstr ""
 "      --obsolete              sinonim pentru --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaxã fiºier de intrare(input:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1100,8 +1095,8 @@ msgstr ""
 "  -P, --properties-input     fiºierul de intrare(input) este în sintaxã "
 "Java .properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1110,25 +1105,43 @@ msgstr ""
 "      --stringtable-input     fiºierul de intrare(input) este în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             nu foloseºte escape-uri C în output\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1136,28 +1149,28 @@ msgstr ""
 "  -E, --escape                foloseºte escape-uri C în output, fãrã "
 "caractere extinse\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              scrie fiºierul PO chiar dacã e gol\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1165,39 +1178,39 @@ msgstr ""
 "  -n, --add-location          genereazã liniile '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     scrie un fiºier .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr " -w, --width=NUMÃR          setare lãþime output paginã\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1208,32 +1221,32 @@ msgstr ""
 "                              decât lãþimea paginii de output,în câteva "
 "linii\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereazã output sortat\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sorteazã output-ul dupã locaþia fiºierului\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selecþie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER_INTRARE]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1257,26 +1270,26 @@ msgstr ""
 "este specificat --use-first, caz în care vor fi preluate din primul fiºier PO pentru\n"
 "a fi definite. Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FIªIER_INTRARE ...                  fiºiere de intrare(input)\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FIªIER          obþine lista de fiºiere de intrare din "
 "FIªIER\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 "Dacã fiºierul de intrare este -, se va citi intrarea(input) standard.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1287,7 +1300,7 @@ msgstr ""
 "este\n"
 "                                 infinit\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1297,7 +1310,7 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "0\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1306,8 +1319,8 @@ msgstr ""
 "  -u, --unique                   scurtãturã pentru --less-than=2, solicitã\n"
 "                                 ca doar mesajele unice sã fie tipãrite\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1315,8 +1328,8 @@ msgstr ""
 "  -P, --properties-input     fiºierele de intrare(input) sunt în sintaxã ."
 "properties Java\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1325,13 +1338,13 @@ msgstr ""
 "      --stringtable-input     fiºierele de intrare(input) sunt în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 " -t, --to-code=NUME             codarea(encoding) pentru ieºire(output)\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1342,41 +1355,33 @@ msgstr ""
 "                                 fiecare mesaj, nu îmbinã mai multe "
 "traduceri\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "nu au fost date fiºiere de intrare(input)"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sunt necesare exact 2 fiºiere de intrare(input)"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Folosire: %s [OPÞIUNE] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1394,22 +1399,22 @@ msgstr ""
 "s-a  gãsit o potrivire exactã, se va marca mesajul cu fuzzy pentru a produce\n"
 "diagnostice mai bune.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduceri\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referinþe la surse\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori de operaþie:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1417,63 +1422,69 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          aplicã ref.pot pe fiecare domeniu din def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+"  -N, --no-fuzzy-matching     nu foloseºte potrivire aproximativã(fuzzy)\n"
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "  -f, --use-fuzzy             foloseºte intrãri parþial traduse la ieºire"
 "(output)\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          pãstreazã pe cele netraduse, ºterge mesajele "
 "traduse\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "acest mesaj este folosit dar nu este definit..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...dar definiþia este similarã"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "acest mesaj este folosit dar nu ºi definit în %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s-a gãsit %d eroare fatalã"
 msgstr[1] "s-au gãsit %d erori fatale"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cel puþin douã fiºiere trebuie specificate"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1494,7 +1505,7 @@ msgstr ""
 "comentariile ºi comentariile extrase vor fi pãstrate, dar doar dacã sunt definite\n"
 "în primul fiºier PO.  Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1504,46 +1515,46 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header              nu include în header intrarea `msgid \"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 "Face conversia unui catalog de traduceri într-o altã codare(encoding) de "
 "caractere.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Þintã conversie:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 "Codarea(encoding) implicitã este codarea(encoding) localizãrii curente.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 "      --force-po                 scrie fiºierul PO chiar dacã este vid\n"
 "  -i, --indent                   scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location              nu scrie linii '#: filename:line'\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1551,29 +1562,29 @@ msgstr ""
 "      --add-location             genereazã linii '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                   scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fiºier de intrare"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "este solicitat exact un singur fiºier de intrare"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Folosire: %s [OPÞIUNE] FIªIER_INTRARE\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1586,23 +1597,23 @@ msgstr ""
 "(în general creat de xgettext).  Intrãrilor netraduse le sunt asignate traduceri care\n"
 "sunt identice cu msgid, ºi care vor fi marcate fuzzy.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 "  FIªIER_INTRARE ...                  fiºiere de intrare(input) PO sau POT\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "lipseºte numele comenzii"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE] COMANDÃ [OPÞIUNE-COMANDÃ]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1617,7 +1628,7 @@ msgstr ""
 "Ieºirea(output) acesteia devine output-ul msgexec.  codul returnat de msgexec\n"
 "este maximumul de returnare de-a lungul tuturor invocaþiilor.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1627,43 +1638,43 @@ msgstr ""
 "un octet null.  Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
 "pentru \"xargs - 0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=FIªIER_INTRARE ...           fiºier de intrare(input) PO\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "scriere la stdout eºuatã"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrierea în subprocesul %s eºuatã"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "lipseºte numele de filtru"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cel puþin un script sed trebuie specificat"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Folosire: %s [OPÞIUNE] FILTRU [OPÞIUNE-FILTRU]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplicã un filtru pe toate traducerile unui catalog de traduceri.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1672,12 +1683,12 @@ msgstr ""
 "FILTRU poate fi orice program care citeºte de la intrarea(input) standard\n"
 "ºi scrie traducerea modificatã la ieºirea(output) standard.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPÞIUNi de FILTRU folositoare atunci când FILTRU este 'sed':\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1685,7 +1696,7 @@ msgstr ""
 "  -e, --expression=SCRIPT     adaugã SCRIPTul la comenzile ce vor fi "
 "executate\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1695,7 +1706,7 @@ msgstr ""
 "  -f, --file=FIªIERSCRIPT       adaugã conþinutul FIªIERSCRIPT la comenzile\n"
 "                                ce vor fi executate\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1703,7 +1714,7 @@ msgstr ""
 "  -n, --quiet, --silent       suprimã tipãrirea automatã a spaþiului model"
 "(pattern)\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1711,13 +1722,13 @@ msgstr ""
 "     --no-escape                nu foloseºte escape-uri C în output "
 "(implicit)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 "      --indent                   scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1725,100 +1736,82 @@ msgstr ""
 "      --keep-header           pãstreazã headerul nemodificat, nu îl "
 "filtreazã\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Neimplimentat încã."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunicaþia cu subprocesul %s a eºuat"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "citirea din subprocesul %s a eºuat"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "subprocesul %s s-a terminat cu cod de ieºire %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentul lui %s ar trebui sã fie un singur caracter de punctuaþie"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s necesitã specificarea \"-d director\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s necesitã specificarea \"-l localizare\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducere aproximativã(fuzzy)"
 msgstr[1] ", %d traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OPÞIUNE] numefiºier.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genereazã un catalog binar de mesaje din descriere de traducere textualã\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1827,17 +1820,17 @@ msgstr ""
 "Argumentele obligatorii pentru opþiunile lungi sunt obligatorii ºi pentru opþiunile\n"
 "scurte. Similar pentru argumentele opþionale.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefiºier.po ...             fiºiere de intrare(input)\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1846,7 +1839,7 @@ msgstr ""
 "  -j, --java                  Mod Java: genereazã o clasã Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1855,54 +1848,54 @@ msgstr ""
 "      --java2                 precum --java, ºi presupune Java2 (JDK 1.2 sau "
 "ulterior)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Mod tcl: genereazã un fiºier tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeazã modul strict Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Dacã fiºierul de ieºire(output) este -, output-ul este scris la ieºirea "
 "standard.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locaþie fiºier output în mod Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURSÃ     nume resursã\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1911,14 +1904,14 @@ msgstr ""
 "  -l, --locale=LOCALIZARE         nume localizare, fie limbã, "
 "fie                                                 limbã_ÞARÃ\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1931,12 +1924,12 @@ msgstr ""
 "separatã de liniuþã_jos.  Opþiunea -d este obligatorie.  Clasa este\n"
 "scrisã în directorul specificat.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, fuzzy, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1944,7 +1937,7 @@ msgid ""
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1954,19 +1947,19 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al cataloagelor de mesaje ."
 "msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1976,12 +1969,12 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fiºier de intrarea(input):\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1992,13 +1985,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verificã ºirurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2006,7 +1999,7 @@ msgid ""
 msgstr ""
 "      --check-header          verificã prezenþa ºi conþinutul header-ului\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2016,7 +2009,7 @@ msgstr ""
 "directivele\n"
 "                                de domenii ºi opþiunea --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2025,7 +2018,7 @@ msgstr ""
 "  -C, --check-compatibility   verificã dacã GNU msgfmt se comportã ca X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2036,103 +2029,103 @@ msgstr ""
 "tastaturã\n"
 "                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             foloseºte intrãri parþial traduse la ieºire"
 "(output)\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=NUMÃR      aliniazã ºirurile la NUMÃR octeþi (implicit: %"
-"d)\n"
+"  -a, --alignment=NUMÃR      aliniazã ºirurile la NUMÃR octeþi (implicit: "
+"%d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               fiºierul binar nu va include tabela de hash\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            afiºeazã statistici despre traduceri\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               mãreºte nivelul de detaliere\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avertisment: headerul fiºierului PO lipseºte sau este invalid\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va funcþiona\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avertisment: headerul fiºierului PO este neclar(fuzzy)\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "avertisment: versiunile mai vechi ale msgfmt ar putea aici raporta o eroare\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "numele de domeniu \"%s\" nu este potrivit ca nume fiºier"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "numele de domeniu \"%s\" nu este potrivit ca nume de fiºier: se va utiliza "
 "prefix"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignoratã"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "intrarea `msgstr' vidã ignoratã"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclarã(fuzzy) ignoratã"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fiºierul sursã conþine traduceri aproximative(fuzzy)"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare în timpul citirii \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2140,7 +2133,7 @@ msgid ""
 msgstr ""
 "opþiunea '%c' nu poate fi folositã înainte ca 'K' sau 'T' sã fie specificate"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2149,7 +2142,7 @@ msgstr ""
 "Extrage toate mesajele unui catalog care se potriveºte unui tipar dat\n"
 "sau care e dependent de fiºiere sursã date.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2215,7 +2208,7 @@ msgstr ""
 "  -f, --file=FIªIER             obþine TIPAR din FIªIER\n"
 "  -i, --ignore-case           ignorã distincþia de caz\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2223,18 +2216,18 @@ msgstr ""
 "      --escape                   foloseºte escape-uri C în output, nu \n"
 "caractere extinse\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "       --sort-output           genereazã output sortat\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "       --sort-by-file          sorteazã output-ul dupã locaþia fiºierului\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2244,7 +2237,7 @@ msgstr ""
 "variabila voastrã de mediu LANG, în modul în care este descris în fiºierul\n"
 "ABOUT-NLS.  Aceasta este necesar pentru a vã testa traducerile.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2255,12 +2248,12 @@ msgstr ""
 "Specificaþi localizarea prin opþiunea --locale sau\n"
 "fiºierul de ieºire(output) .po prin opþiunea --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "S-a creat %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2269,12 +2262,12 @@ msgstr ""
 "Creazã un nou fiºer PO, iniþializând informaþiile meta cu valori pentru\n"
 "mediul utilizatorului.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=FIªIER_INTRARE       fiºierul de intrare POT\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2286,13 +2279,13 @@ msgstr ""
 "fiºierul POT.\n"
 "Dacã acesta este -, se va citi intrarea(input) standard.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FIªIER      scrie output-ul spre fiºierul PO specificat\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2303,12 +2296,12 @@ msgstr ""
 "sau de setãrile de localizare ale utilizatorului.\n"
 "Dacã este -, rezultatele vor fi scrise la ieºirea(output) standard.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          seteazã localizarea þintã\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2316,7 +2309,7 @@ msgstr ""
 "      --no-translator         se presupune cã fiºierul PO este generat "
 "automat\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2324,12 +2317,12 @@ msgstr ""
 "S-a gãsit mai mult de un fiºier .pot.\n"
 "Specificaþi fiºierul de intrare .pot prin opþiunea --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "eroare în citirea directorului curent"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2337,14 +2330,14 @@ msgstr ""
 "Nu s-a gãsit nici un fiºier .pot în directorul curent.\n"
 "Vã rugãm specificaþi fiºierul de intrare .pot prin opþiunea --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "subprocesul %s a eºuat cu cod de ieºire %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2361,26 +2354,26 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traducerea în limba românã pentru pachetul %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "setul de caractere prezent \"%s\" nu este un nume de codare(encoding) "
 "portabil"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 "douã seturi diferite de caractere \"%s\" ºi \"%s\" în fiºierul de intrare"
 "(input)"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2388,7 +2381,7 @@ msgstr ""
 "fiºierul de intrare(input) `%s' nu conþine un header cu specificaþie de set "
 "de caractere"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2397,20 +2390,20 @@ msgstr ""
 "domeniu \"%s\" din fiºierul de intrare `%s' nu conþine un header cu o "
 "specificaþie de set de caractere"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "setul de caractere þintã \"%s\" nu este un nume de codare(encoding) portabil."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2420,7 +2413,7 @@ msgstr ""
 "printre altele.\n"
 "Se converteºte ieºirea(output) în UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2435,7 +2428,7 @@ msgstr ""
 "opþiunea\n"
 "--to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2444,7 +2437,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2457,12 +2450,12 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "Rezolvãri(workadrounds) posibile sunt:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Setare LC_ALL la o localizare cu codare(encoding) %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2473,7 +2466,7 @@ msgstr ""
 "  dupã care se aplicã '%s',\n"
 "  ºi apoi reconvertire în %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2486,7 +2479,7 @@ msgstr ""
 "  apoi aplicarea '%s',\n"
 "  dupã care se reconverteºte în %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2498,78 +2491,78 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "O posibilã soluþie(workaround) este setarea LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "expresiile plurale pot produce valori negative"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu dar expresiile plurale pot produce valori pânã la %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "expresia pluralã poate produce împãrþire la zero"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce depãºire(overflow) de întreg(integer)"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "expresia pluralã poate produce excepþii aritmetice, posibil împãrþire la zero"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Încercaþi sã folosiþi urmãtoarele, valide pentru %s:\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "catalogul de mesaje are traduceri în forme plurale..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=EXPRESSION\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=INTEGER\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "valoare nplurals invalidã"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "expresie pluralã invalidã"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...dar câteva mesaje au doar o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au doar %lu forme plurale"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...dar câteva mesaje au o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au %lu forme plurale"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2577,84 +2570,85 @@ msgstr ""
 "catalogul de mesaje are traduceri de formã pluralã, dar îi lipseºte un "
 "header cu\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipularea de plurale este o extensie a GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr nu are marcaj de accelerator de tastaturã '%c'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr are prea multe marcaje de acceleratoare tastaturã '%c'"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "câmpul header '%s' lipseºte din header\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "câmpul header `%s' ar trebui sã înceapã la începutul liniei\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "câteva câmpuri de header ar trebui sã aibã valoare implicitã iniþialã\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "câmpul `%s' încã are valoarea implicitã iniþialã\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"câteva câmpuri de header ar trebui sã aibã valoare implicitã iniþialã\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "fiºierul de intrare(input) nu conþine un header cu specificaþia unui set de "
 "caractere"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2663,7 +2657,7 @@ msgstr ""
 "Nu se poate converti din \"%s\" în \"%s\". %s se bazeazã pe inconv(), iar "
 "iconv() nu suportã aceastã conversie."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2672,8 +2666,8 @@ msgstr ""
 "Conversia din \"%s\" în \"%s\" introduce duplicate: anumite msgid-uri "
 "diferite devin egale."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2682,16 +2676,16 @@ msgstr ""
 "Nu se poate converti din \"%s\" în \"%s\". %s se bazeazã pe iconv(). Aceastã "
 "versiune a fost construitã(built) fãrã inconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s e valid doar cu %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tip de backup"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2715,17 +2709,17 @@ msgstr ""
 "exactã, se va folosi potrivirea aproximativã(fuzzy) pentru a produce rezultate\n"
 "mai bune.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      traducerile referitoare la surse vechi\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referinþe la surse noi\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2735,7 +2729,7 @@ msgstr ""
 "mesaje,\n"
 "                              poate fi specificatã de mai multe ori\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2745,27 +2739,27 @@ msgstr ""
 "                              nu face nimic dacã def.po este deja adus la "
 "zi\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Locaþie fiºiere de ieºire(output) în modul aducerii la zi(update):\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultatele vor fi scrise în def.po:\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        se creazã un backup al def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIX         suprascrie sufixul obiºnuit de backup\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2785,7 +2779,7 @@ msgstr ""
 "  existing, nil   numerotate dacã existã backup-uri, simple în caz contrar\n"
 "  simple, never   creazã întotdeauna backup-uri simple\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2796,13 +2790,7 @@ msgstr ""
 "cu\n"
 "variabila de mediu SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching     nu foloseºte potrivire aproximativã(fuzzy)\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2810,22 +2798,22 @@ msgstr ""
 "      --translated            pãstreazã pe cele traduse, ºterge mesajele "
 "netraduse\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprimã indicatorii de progres\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "acest mesaj ar trebui sã defineascã formele plurale"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "acest mesaj nu ar trebui sã defineascã formele plurale"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2834,26 +2822,28 @@ msgstr ""
 "%sCitite %ld vechi + %ld referinþe, unite %ld, aproximãri %ld, lipsã %ld, "
 "învechite %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " efectuat.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ºi numele de fiºiere explicite se exclud reciproc"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Converteºte catalogul de mesaje binar în fiºier .po stil Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2862,14 +2852,14 @@ msgstr ""
 "  -j, --java               mod Java: intrarea(input) este o clasã Java\n"
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, fuzzy, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2878,7 +2868,7 @@ msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2886,17 +2876,17 @@ msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FIªIER ...                 fiºiere de intrare(input) .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2907,12 +2897,12 @@ msgstr ""
 "resursei, separat de liniuþã_jos(underscore).  Clasa e localizatã folosind "
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Tcl:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2922,12 +2912,12 @@ msgstr ""
 "directorul\n"
 "specificat.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Locaþie fiºiere intrare în mod Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2937,18 +2927,18 @@ msgstr ""
 "directorul\n"
 "specificat.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent             scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                   scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2970,12 +2960,12 @@ msgstr ""
 "Poziþiile din fiºier vor fi cumulate.  Dacã se foloseºte opþiunea --unique,\n"
 "duplicatele vor fi omise.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 afiºeazã doar duplicatele\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2984,7 +2974,7 @@ msgstr ""
 " -u, --unique                   afiºeazã doar mesajele unice, omiþând "
 "duplicatele\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -3073,65 +3063,65 @@ msgstr "primul plural are index nonzero"
 msgid "plural form has wrong index"
 msgstr "forma pluralã are index greºit"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "prea multe erori, se renunþã"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secvenþã multibyte invalidã"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secvenþã multibyte incompletã la sfârºitul fiºierului"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secvenþã multibyte incompletã la sfârºitul liniei"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "eroare iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "cuvântul cheie \"%s\" este necunoscut"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "secvenþã de control invalidã"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "sfârºit de fiºier în ºir"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "sfârºit de linie în ºir"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "acest fiºier poate sã nu conþinã directive de domeniu"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definiþie duplicatã de mesaj"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...aceasta este locaþia primei definiþii"
@@ -3222,17 +3212,17 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "se aºteptau douã argumente"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Folosire: %s [OPÞIUNE] URL FIªIER\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3241,11 +3231,26 @@ msgstr ""
 "Aduce(fetches) ºi afiºeazã(outputs) conþinutul unui URL.  Dacã URL-ul nu poate\n"
 "fi accesat, se va folosi în loc FIªIERul accesibil local.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "eroare în scrierea stdout"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 #, fuzzy
 msgid ""
@@ -3291,47 +3296,47 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã, dar formatul de ieºire"
 "(output) nu le suportã."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "ieºire(output) standard"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "eroare în crearea \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nu este un nume valid de clasã Java: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3343,14 +3348,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare în deschiderea \"%s\" pentru scriere"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "mesajele internaþionalizate nu ar trebui sã conþinã secvenþa de escape `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3365,7 +3370,7 @@ msgstr ""
 "pur ASCII în loc.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3391,13 +3396,13 @@ msgstr ""
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"catalogul de mesaje are ºiruri msgid care conþin caractere din afara ISO-"
-"8859-1\n"
+"catalogul de mesaje are ºiruri msgid care conþin caractere din afara "
+"ISO-8859-1\n"
 "dar formatul catalogului de mesaje Qt suportã Unicode doar în ºirurile "
 "traduse,\n"
 "nu ºi in cele netraduse.\n"
@@ -3408,8 +3413,8 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"catalogul de mesaje are ºiruri msgid care conþin caractere din afara ISO-"
-"8859-1\n"
+"catalogul de mesaje are ºiruri msgid care conþin caractere din afara "
+"ISO-8859-1\n"
 "dar formatul catalogului de mesaje Qt suportã Unicode doar în ºirurile "
 "traduse,\n"
 "nu ºi in cele netraduse.\n"
@@ -3419,7 +3424,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "eroare în scrierea fiºierului \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3428,7 +3433,7 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Qt nu suportã manipularea pluralelor\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3454,36 +3459,34 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Tcl nu suportã manipularea pluralelor\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulatã neterminatã"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avertisment: constantã caracter neterminatã"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: ºir literal neterminat"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3492,7 +3495,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3501,7 +3504,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3510,7 +3513,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3519,12 +3522,12 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "eroare iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3533,32 +3536,32 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avertisment: caracter Unicode invalid"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: avertisment: s-a gãsit ')' unde se aºtepta '}'"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avertisment: s-a gãsit '}' unde se aºtepta ')'"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3567,58 +3570,57 @@ msgstr ""
 "Limbajul \"glade\" nu este suportat. %s se bazeazã pe expat.\n"
 "Aceastã versiune a fost construitã fãrã expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: nu se poate gãsi terminatorul de ºir \"%s\" oriunde înainte de EOF"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: lipseºte acoladã dreaptã în \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\l\") a caracterului pe 8biþi \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\u\") a caracterului pe 8biþi \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: interpolare invalidã de variabilã la \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\L\") a caracterului pe 8biþi  \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\U\") a caracterului pe 8biþi  \"%c\""
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3628,7 +3630,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3638,7 +3640,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3648,7 +3650,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3658,7 +3660,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3668,27 +3670,27 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definiþie invalidã de ºir"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: lipseºte numãr dupã #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresie ºir invalidã"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3697,30 +3699,30 @@ msgstr ""
 "%s:%lu: avertisment: sintaxa $\"...\" nu se mai foloseºte din motive de "
 "securitate; înlocuiþi cu eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nu poate fi folosit când output-ul este scris la stdout"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nu poate funcþiona fãrã cuvinte cheie dupã care sã caute"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "avertisment: fiºierul `%s' extensia `%s' este necunoscut(ã); se va încerca C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrage ºirurile traductibile din fiºierele de intrare(input) specificate.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3729,13 +3731,13 @@ msgstr ""
 "  -d, --default-domain=NUME      foloseºte NUME.po pentru output \n"
 "(în loc de messages.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FIªIER              scrie output-ul în fiºierul specificat\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3744,12 +3746,12 @@ msgstr ""
 "în \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fiºierelor de intrare(input):\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3767,12 +3769,12 @@ msgstr ""
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurtãturã pentru --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3782,7 +3784,7 @@ msgstr ""
 "intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3791,29 +3793,32 @@ msgstr ""
 "      --from-code=NUME        codare pentru fiºierele de intrare(input)\n"
 "                                (exceptând Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Implicit fiºierele de intrare(input) sunt presupuse a fi în ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            alãturã mesajele fiºierului existent\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FIªIER.po     intrãrile din FIªIER.po nu vor fi "
 "extrase\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ETICHETÃ]       plaseazã blocul de comentarii cu\n"
 "                                 ETICHETÃ (sau pe acelea care preced liniile "
@@ -3821,17 +3826,17 @@ msgstr ""
 "                                 cuvinte cheie) în fiºierul de ieºire"
 "(output)\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opþiuni specifice limbajului:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate ºirurile\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3843,18 +3848,18 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-sursã, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=CUVÂNT]        cuvinte cheie de cãutat (fãrã\n"
 "                                  CUVÂNT înseamnã neutilizarea "
 "cuvintelor_cheie\n"
 "                                  implicite)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3865,7 +3870,7 @@ msgstr ""
 "argumentul\n"
 "                              numãrul ARG al cuvântului cheie CUVÂNT\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3877,7 +3882,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-sursã)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
@@ -3885,32 +3890,32 @@ msgstr ""
 "pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3918,19 +3923,19 @@ msgstr ""
 "      --debug                    rezultat mai detaliat al recunoaºterii "
 "formatstring\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la ieºire"
 "(output)\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3938,19 +3943,19 @@ msgstr ""
 "      --foreign-user          omite copyright FSF la ieºire pentru user "
 "strãin(foreign)\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la ieºire"
 "(output)\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3958,42 +3963,59 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESÃ  seteazã adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=ªIR]  foloseºte ªIR sau \"\" ca prefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=ªIR]  foloseºte ªIR sau \"\" ca suefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Un argument --flag nu are sintaxa <keyword>:<argnum>:[pass-]<flag> : %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4002,16 +4024,16 @@ msgstr ""
 "Deºi este folosit într-o poziþie de format a ºirului, %s nu este un format\n"
 "al ºirului valid %s. Motiv: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Deºi este declarat astfel, %s nu este un format al ºirului valid %s: Motiv:\n"
 "%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4020,7 +4042,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4030,27 +4052,27 @@ msgstr ""
 "gettext(\"\") returneazã header-ul cu informaþii\n"
 "meta, nu cu ºirul vid.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4062,7 +4084,7 @@ msgstr ""
 "aici variabila MSGID_BUGS_ADDRESS; în caz contrar\n"
 "vã rugãm specificaþi optiunea --msgid-bugs-address în linia de comandã.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
@@ -4071,6 +4093,30 @@ msgstr "limbajul `%s' este necunoscut"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opþiune ilegalã -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle a eºuat cu cod de eroare 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Neimplimentat încã."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "comunicaþia cu subprocesul %s a eºuat"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "citirea din subprocesul %s a eºuat"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "subprocesul %s s-a terminat cu cod de ieºire %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "câmpul `%s' încã are valoarea implicitã iniþialã\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Referinþe multiple la % % %c."
 

diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index 5f599cf288e6499b76fa1fec72aca16b553b128d..3abe0d1dd6e63cb3d622739c1f9aa3f883a1428f 100644 (file)
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-06-14 10:41+0400\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"
-"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"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -31,22 +32,22 @@ msgstr "
 msgid "Valid arguments are:"
 msgstr "äÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ, ÐÏÐÒÏÂÕÊÔÅ ÕÓÔÁÎÏ×ÉÔØ $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ Ó ÐÏÍÏÝØÀ ÛÁÂÌÏÎÁ \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ×ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ %s"
@@ -55,44 +56,44 @@ msgstr "
 msgid "write error"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÞÔÅÎÉÑ"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÒÅÚÅÒ×ÎÏÇÏ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÐÏÓÌÅ ÞÔÅÎÉÑ \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "×ÙÚÏ× fdopen() ÎÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "îÅ ÎÁÊÄÅÎ ËÏÍÐÉÌÑÔÏÒ C#, ÐÏÐÒÏÂÕÊÔÅ ÐÏÓÔÁ×ÉÔØ pnet"
@@ -102,74 +103,73 @@ msgstr "
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ C#, ÐÏÐÒÏÂÕÊÔÅ ÐÏÓÔÁ×ÉÔØ pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -181,20 +181,20 @@ msgstr "
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ target_version ÄÌÑ compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ÐÏÐÙÔËÁ ÓÏÚÄÁÎÉÑ \"%s\" ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -207,20 +207,20 @@ msgstr ""
 "îÅ ÎÁÊÄÅÎÁ ×ÉÒÔÕÁÌØÎÁÑ ÍÁÛÉÎÁ Java, ÐÏÓÔÁ×ØÔÅ gij ÉÌÉ ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "ÏÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÄÏÞÅÒÎÅÍ ÐÒÏÃÅÓÓÅ %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "ÏÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -239,72 +239,71 @@ msgstr "
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "ÏÐÅÒÁÃÉÑ DuplicateHandle ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ÏÐÅÒÁÃÉÑ _open_osfhandle ÎÅÕÓÐÅÛÎÁ"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÐÏÌÕÞÉÌ ÆÁÔÁÌØÎÙÊ ÓÉÇÎÁÌ %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s × ÏÔÌÉÞÉÅ ÏÔ 'msgid'.  "
 "ðÒÉÞÉÎÁ: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' ËÁË × '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u × '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "× `msgid' É `%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %u"
 
 #: src/format-boost.c:449
@@ -334,9 +333,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔ ÎÏÍÅÒ %u, ÎÏ ÉÇÎÏÒÉÒÕÅÔ ÁÒÇÕÍÅÎÔ ÎÏÍÅÒ %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "ÎÅ ÓÏ×ÐÁÄÁÅÔ ÞÉÓÌÏ ÓÐÅÃÉÆÉËÁÃÉÊ ÆÏÒÍÁÔÁ ÐÅÞÁÔÉ × `msgid' É `%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -378,17 +377,17 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "óÔÒÏËÁ ÓÏÄÅÒÖÉÔ ÎÅÐÁÒÎÕÀ '}' ÐÏÓÌÅ ÄÉÒÅËÔÉ×Ù ÎÏÍÅÒ %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÅ×ÅÒÎÁÑ ËÏÍÂÉÎÁÃÉÑ ÆÌÁÇÏ×."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÕËÁÚÙ×ÁÔØ ÔÏÞÎÏÓÔØ."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -396,31 +395,31 @@ msgid ""
 msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÏÍÅÒ ÁÒÇÕÍÅÎÔÁ ÄÌÑ ÔÏÞÎÏÓÔÉ ÄÏÌÖÅÎ ÂÙÔØ ÒÁ×ÅÎÏ %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÕËÁÚÙ×ÁÔØ ÔÏÞÎÏÓÔØ."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÎÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÔÏÞÎÏÓÔÉ."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÐÅÒÅÄ '%c' ÎÅÌØÚÑ ÐÉÓÁÔØ ÆÌÁÇÉ."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "÷ 'msgid' ÉÓÐÏÌØÚÕÅÔÓÑ %%m, ÎÏ × '%s' ÎÅÔ"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "÷ 'msgid' ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ %%m, ÎÏ × '%s' ÉÓÐÏÌØÚÕÅÔÓÑ"
 
 #: src/format-invalid.h:22
@@ -520,21 +519,20 @@ msgstr ""
 "'<', '#' ÉÌÉ '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%u' × 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ËÁË × '%s'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u} ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ {%u}"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -550,11 +548,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -602,13 +600,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ËÁËÏÊ-ÔÏ ÁÒÇÕÍÅÎÔ ÎÅÓÏ×ÍÅÓÔÉÍÙÍ ÏÂÒÁÚÏÍ."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × `msgid' É `%s' ÎÅ ÜË×É×ÁÌÅÎÔÎÙ"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s' ÎÅ Ñ×ÌÑÀÔÓÑ ÐÏÄÍÎÏÖÅÓÔ×ÏÍ ÓÐÅÃÉÆÉËÁÃÉÊ ÉÚ "
 "'msgid' "
@@ -622,12 +620,12 @@ msgstr ""
 "÷ ÄÉÒÅËÔÉ×Å ÎÏÍÅÒ %u ÓÐÅÃÉÆÉËÁÔÏÒ ÒÁÚÍÅÒÁ ÎÅÓÏ×ÍÅÓÔÉÍ ÓÏ ÓÐÅÃÉÆÉËÁÔÏÒÏÍ "
 "ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ × '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -635,43 +633,40 @@ msgstr ""
 "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔÙ ËÁË ÐÏ ÉÍÅÎÁÍ, ÔÁË É ÐÏ ÎÅÉÍÅÎÏ×ÁÎÙÍ "
 "ÓÐÅÃÉÆÉËÁÃÉÑÍ ÁÒÇÕÍÅÎÔÏ×."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "óÔÒÏËÁ ÓÓÙÌÁÅÔÓÑ ÎÁ ÁÒÇÕÍÅÎÔ ÐÏ ÉÍÅÎÉ '%s' ÎÅÓÏ×ÍÅÓÔÉÍÙÍ ÏÂÒÁÚÏÍ."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ÏÔÏÂÒÁÖÅÎÉÅ, Á × '%s' -- ËÏÒÔÅÖ"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "ÓÐÅÃÉÆÉËÁÃÉÑ ÆÏÒÍÁÔÁ × 'msgid' ÏÖÉÄÁÅÔ ËÏÒÔÅÖ, Á × '%s' -- ÏÔÏÂÒÁÖÅÎÉÅ"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "× 'msgid' ÎÅÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ '%s', ËÁË × '%s'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "× 'msgid' É '%s' ÎÅ ÓÏ×ÐÁÄÁÀÔ ÓÐÅÃÉÆÉËÁÃÉÉ ÆÏÒÍÁÔÁ ÄÌÑ ÁÒÇÕÍÅÎÔÁ %s"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -714,11 +709,11 @@ msgid ""
 "1 and 9."
 msgstr "úÎÁË, ÚÁ×ÅÒÛÁÀÝÉÊ ÄÉÒÅËÔÉ×Õ ÎÏÍÅÒ %u ÎÅ Ñ×ÌÑÅÔÓÑ ÃÉÆÒÏÊ ÍÅÖÄÕ 1 É 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -727,38 +722,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "âÒÕÎÏ èÁÊÂÌÅ"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]\n"
@@ -794,29 +789,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ÁÄÒÅÓÁ ÄÌÑ ÚÁÄÁÎÎÏÇÏ ÉÍÅÎÉ ÍÁÛÉÎÙ\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "éÎÆÏÒÍÁÃÉÏÎÎÙÊ ×Ù×ÏÄ:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
@@ -825,11 +820,11 @@ msgstr "  -V, --version               
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-gnu-gettext@gnu.org>.\n"
 
@@ -838,30 +833,30 @@ msgstr "
 msgid "could not get host name"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ÍÁÛÉÎÙ"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ÐÒÉÎÉÍÁÅÔÓÑ ÎÅ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s É %s ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -870,64 +865,64 @@ msgstr ""
 "æÉÌØÔÒÕÅÔ ÓÏÏÂÝÅÎÉÑ ËÁÔÁÌÏÇÁ ÐÅÒÅ×ÏÄÏ× × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÉÈ ÁÔÒÉÂÕÔÁÍÉ\n"
 "É ÍÁÎÉÐÕÌÉÒÕÅÔ ÜÔÉÍÉ ÁÔÒÉÂÕÔÁÍÉ.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ÷èïäîïê-æáêì                ×ÈÏÄÎÏÊ PO-ÆÁÊÌ\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=ëáôáìïç     ÄÏÂÁ×ÉÔØ ëáôáìïç Ë ÐÕÔÉ ÐÏÉÓËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=æáêì      ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -936,12 +931,12 @@ msgstr ""
 "òÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ\n"
 "ÉÌÉ ÚÁÄÁÎ ËÁË -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "÷ÙÂÏÒ ÓÏÏÂÝÅÎÉÊ:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -949,7 +944,7 @@ msgstr ""
 "      --translated            ÓÏÈÒÁÎÉÔØ ÐÅÒÅ×ÅÄÅÎÎÙÅ, ÕÄÁÌÉÔØ "
 "ÎÅÐÅÒÅ×ÅÄÅÎÎÙÅ\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -957,63 +952,63 @@ msgstr ""
 "      --untranslated          ÓÏÈÒÁÎÉÔØ ÎÅÐÅÒÅ×ÅÄÅÎÎÙÅ, ÕÄÁÌÉÔØ "
 "ÐÅÒÅ×ÅÄÅÎÎÙÅ\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ÕÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏÍÅÞÅÎÎÙÅ ËÁË 'ÎÅÔÏÞÎÙÅ'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            ÓÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏÍÅÞÅÎÎÙÅ ËÁË 'ÎÅÔÏÞÎÙÅ'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 "      --no-obsolete           ÕÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ ËÁË 'ÓÔÁÒÙÅ'\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         ÓÏÈÒÁÎÉÔØ ÓÏÏÂÝÅÎÉÑ, ÐÏÍÅÞÅÎÎÙÅ ËÁË 'ÓÔÁÒÙÅ'\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "íÁÎÉÐÕÌÑÃÉÑ ÁÔÒÉÂÕÔÁÍÉ:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ÐÏÍÅÔÉÔØ ×ÓÅ ÓÏÏÂÝÅÎÉÑ ËÁË 'ÎÅÔÏÞÎÙÅ'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           ÓÎÑÔØ ×ÓÅ ÐÏÍÅÔËÉ 'ÎÅÔÏÞÎÏÅ'\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ÐÏÍÅÔÉÔØ ×ÓÅ ÓÏÏÂÝÅÎÉÑ ËÁË 'ÓÔÁÒÙÅ'\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        ÓÎÑÔØ ×ÓÅ ÐÏÍÅÔËÉ 'ÓÔÁÒÏÅ'\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-previous        ÓÎÑÔØ ×ÓÅ ÐÏÍÅÔËÉ 'ÐÒÅÄÙÄÕÝÉÊ msgid'\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1021,7 +1016,7 @@ msgstr ""
 "      --only-file=æáêì.po     ÏÂÒÁÂÏÔÁÔØ ÓÏÏÂÝÅÎÉÑ, ÐÅÒÅÞÉÓÌÅÎÎÙÅ × æáêìå."
 "po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1029,36 +1024,36 @@ msgstr ""
 "      --ignore-file=æáêì.po   ÏÂÒÁÂÏÔÁÔØ ÓÏÏÂÝÅÎÉÑ, ÎÅ ÐÅÒÅÞÉÓÌÅÎÎÙÅ × æáêìå."
 "po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 ÓÉÎÏÎÉÍ ÄÌÑ --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              ÓÉÎÏÎÉÍ ÄÌÑ --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "óÉÎÔÁËÓÉÓ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      ×ÈÏÄÎÏÊ ÆÁÊÌ ÉÍÅÅÔ ÓÉÎÔÁËÓÉÓ Java .properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1067,17 +1062,35 @@ msgstr ""
 "      --stringtable-input     ×ÈÏÄÎÏÊ ÆÁÊÌ ÉÍÅÅÔ ÓÉÎÔÁËÓÉÓ NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "ðÏÄÒÏÂÎÏÓÔÉ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1086,9 +1099,9 @@ msgstr ""
 "                                escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ÑÚÙËÁ C (ÐÏ "
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1096,28 +1109,28 @@ msgstr ""
 "  -E, --escape                ÉÓÐÏÌØÚÏ×ÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ, Á ÎÅ\n"
 "                                ÒÁÓÛÉÒÅÎÎÙÅ ÚÎÁËÉ\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ÚÁÐÉÓÁÔØ PO-ÆÁÊÌ, ÄÁÖÅ ÅÓÌÉ ÏÎ ÐÕÓÔ\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                ÆÏÒÍÁÔÉÒÏ×ÁÔØ PO-ÆÁÊÌ, ÉÓÐÏÌØÚÕÑ ÏÔÓÔÕÐÙ\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           ÎÅ ÐÉÓÁÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1125,8 +1138,8 @@ msgstr ""
 "  -n, --add-location          ÇÅÎÅÒÉÒÏ×ÁÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ' (ÐÏ "
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1135,32 +1148,32 @@ msgstr ""
 "ÓÔÁÎÄÁÒÔÕ\n"
 "                                Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     ÚÁÐÉÓÁÔØ .properties-ÆÁÊÌ Java\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    ÚÁÐÉÓÁÔØ .strings-ÆÁÊÌ NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=þéóìï           ÚÁÄÁÅÔ ÛÉÒÉÎÕ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1169,31 +1182,31 @@ msgstr ""
 "      --no-wrap               ÎÅ ÒÁÚÂÉ×ÁÔØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ, ËÏÔÏÒÙÅ ÄÌÉÎÅÅ\n"
 "                              ÛÉÒÉÎÙ ×ÙÈÏÄÎÏÊ ÓÔÒÁÎÉÃÙ\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ÚÁÄÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ËÒÉÔÅÒÉÊ ×ÙÂÏÒÁ (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [÷èïäîïê-æáêì]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1217,24 +1230,24 @@ msgstr ""
 "ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ.  ëÏÍÍÅÎÔÁÒÉÉ, ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ\n"
 "ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ÷èïäîïê-æáêì...             ×ÈÏÄÎÙÅ ÆÁÊÌÙ\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=æáêì       ÐÏÌÕÞÉÔØ ÓÐÉÓÏË ×ÈÏÄÎÙÈ ÆÁÊÌÏ× ÉÚ æáêìá\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1245,7 +1258,7 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ\n"
 "                               ÎÅ ÏÇÒÁÎÉÞÅÎÏ)\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1256,7 +1269,7 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ\n"
 "                              ÂÏÌØÛÅ ÎÕÌÑ)\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1265,8 +1278,8 @@ msgstr ""
 "  -u, --unique                ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --less-than=2, ÚÁÐÒÁÛÉ×ÁÅÔ\n"
 "                              ÐÅÞÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÈ ÓÏÏÂÝÅÎÉÊ\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1274,8 +1287,8 @@ msgstr ""
 "  -P, --properties-input      ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÉÍÅÀÔ ÓÉÎÔÁËÓÉÓ Java ."
 "properties\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1285,12 +1298,12 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=éíñ           ×ÙÈÏÄÎÁÑ ËÏÄÉÒÏ×ËÁ\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1300,41 +1313,33 @@ msgstr ""
 "ËÁÖÄÏÇÏ\n"
 "                              ÓÏÏÂÝÅÎÉÑ, ÎÅ ÏÂßÅÄÉÎÑÔØ ÐÅÒÅ×ÏÄÙ\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "ðÉÔÅÒ íÉÌÌÅÒ"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ÎÅ ÚÁÄÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ Ä×Á ×ÈÏÄÎÙÈ ÆÁÊÌÁ"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1352,22 +1357,22 @@ msgstr ""
 "äÌÑ ÕÌÕÞÛÅÎÉÑ ÄÉÁÇÎÏÓÔÉËÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ\n"
 "ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ ÓÏ×ÐÁÄÅÎÉÅ.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      ÐÅÒÅ×ÏÄÙ\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ÓÓÙÌËÉ ÎÁ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "íÏÄÉÆÉËÁÔÏÒÙ ÒÅÖÉÍÁ ÒÁÂÏÔÙ:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1375,47 +1380,52 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ÐÒÉÍÅÎÉÔØ ref.pot ËÏ ×ÓÅÍ ÄÏÍÅÎÁÍ ÉÚ def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     ÎÅ ÐÒÉÍÅÎÑÔØ ÎÅÞÅÔËÏÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅÔÏÞÎÙÅ ÚÁÐÉÓÉ\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      ÉÓÐÏÌØÚÏ×ÁÔØ ÎÅÐÅÒÅ×ÅÄÅÎÎÙÅ ÚÁÐÉÓÉ\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÐÅÒÅ×ÅÄÅÎÏ"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ÐÒÏ×ÅÒÅÎÏ ÐÅÒÅ×ÏÄÞÉËÏÍ"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÏÇÒÁÍÍÏÊ, ÎÏ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ÏÄÎÁËÏ ÚÄÅÓØ ÏÐÒÅÄÅÌÅÎÏ ÐÏÈÏÖÅÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ × %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1423,12 +1433,12 @@ msgstr[0] "
 msgstr[1] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÅ ÏÛÉÂËÉ"
 msgstr[2] "ÎÁÊÄÅÎÏ %d ËÒÉÔÉÞÅÓËÉÈ ÏÛÉÂÏË"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÎÅ ÍÅÎÅÅ Ä×ÕÈ ÆÁÊÌÏ×"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1448,7 +1458,7 @@ msgstr ""
 "ÔÏÌØËÏ ÉÚ ÐÅÒ×ÏÇÏ PO-ÆÁÊÌÁ, × ËÏÔÏÒÏÍ ÏÎÉ ÂÙÌÉ ÏÐÒÅÄÅÌÅÎÙ.  ëÏÍÍÅÎÔÁÒÉÉ,\n"
 "ÓÏÄÅÒÖÁÝÉÅ ÉÍÑ ÆÁÊÌÁ É ÎÏÍÅÒ ÓÔÒÏËÉ ÓÏÈÒÁÎÑÀÔÓÑ ÄÌÑ ×ÓÅÈ PO-ÆÁÊÌÏ×.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1459,41 +1469,41 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ\n"
 "                              ÂÏÌØÛÅ ÏÄÎÏÇÏ)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           ÎÅ ×Ù×ÏÄÉÔØ ÚÁÇÏÌÏ×ÏË Ó ÐÏÌÅÍ `msgid \"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "ðÒÅÏÂÒÁÚÕÅÔ ËÁÔÁÌÏÇ ÐÅÒÅ×ÏÄÏ× × ÄÒÕÇÕÀ ËÏÄÉÒÏ×ËÕ.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "ãÅÌØ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÄÉÒÏ×ËÁ ÔÅËÕÝÅÊ ÌÏËÁÌÉ.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ ×Ù×ÏÄÅ ÏÔÓÔÕÐÙ\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           ÕÂÒÁÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ'\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1501,30 +1511,30 @@ msgstr ""
 "      --add-location          ÓÏÈÒÁÎÑÔØ ÓÔÒÏËÉ '#: ÆÁÊÌ:ÓÔÒÏËÁ' (ÐÏ "
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                ×Ù×ÏÄÉÔØ × ÓÔÒÏÇÏÍ ÓÏÏÔ×ÅÔÓÔ×ÉÉ ÓÔÁÎÄÁÒÔÕ "
 "Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ÎÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÒÏ×ÎÏ ÏÄÉÎ ×ÈÏÄÎÏÊ ÆÁÊÌ"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ÷èïäîïê-æáêì\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1537,22 +1547,22 @@ msgstr ""
 "ÐÒÏÇÒÁÍÍÏÊ xgettext).  îÅÐÅÒÅ×ÅÄÅÎÎÙÍ ÓÏÏÂÝÅÎÉÑÍ ÄÁÅÔÓÑ ÐÅÒÅ×ÏÄ,\n"
 "ÓÏ×ÐÁÄÁÀÝÉÊ Ó msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ÷èïäîïê-æáêì                ×ÈÏÄÎÏÊ PO- ÉÌÉ POT-ÆÁÊÌ\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "ÎÅ ÚÁÄÁÎÁ ËÏÍÁÎÄÁ"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ëïíáîäá [ëìàþ-ëïíáîäù]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1567,7 +1577,7 @@ msgstr ""
 "×Ù×ÏÄ ÏÔÐÒÁ×ÌÑÅÔÓÑ ÎÁ ×ÙÈÏÄ msgexec.  úÎÁÞÅÎÉÅ, ×ÏÚ×ÒÁÝÁÅÍÏÅ msgexec --\n"
 "ÜÔÏ ÍÁËÓÉÍÁÌØÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÓÒÅÄÉ ×ÓÅÈ ×ÙÚÏ×Ï×.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1576,42 +1586,42 @@ msgstr ""
 "óÐÅÃÉÁÌØÎÁÑ ×ÓÔÒÏÅÎÎÁÑ ËÏÍÁÎÄÁ '0' ×Ù×ÏÄÉÔ ÐÅÒÅ×ÏÄ É ÚÁ ÎÉÍ ÎÕÌÅ×ÏÊ\n"
 "ÂÁÊÔ.  ÷Ù×ÏÄ \"msgexec 0\" ÐÏÄÈÏÄÉÔ ÄÌÑ ÐÅÒÅÄÁÞÉ ÎÁ ×ÈÏÄ \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=÷èïäîïê-æáêì    ×ÈÏÄÎÏÊ PO-ÆÁÊÌ\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "ÚÁÐÉÓØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅÕÓÐÅÛÎÁ"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "ÚÁÐÉÓØ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ %s ÎÅÕÓÐÅÛÎÁ"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÆÉÌØÔÒÁ"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ÓÃÅÎÁÒÉÊ sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] æéìøôò [ëìàþ-æéìøôòá]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "ðÒÉÍÅÎÑÅÔ ÆÉÌØÔÒ ËÏ ×ÓÅÍ ÐÅÒÅ×ÏÄÁÍ ËÁÔÁÌÏÇÁ.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1621,18 +1631,18 @@ msgstr ""
 "É\n"
 "ÐÅÞÁÔÁÀÝÅÊ ÉÚÍÅÎÅÎÎÙÊ ÐÅÒÅ×ÏÄ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "ðÏÌÅÚÎÙÅ ëìàþé-æéìøôòá × ÓÌÕÞÁÅ, ÅÓÌÉ æéìøôòïí Ñ×ÌÑÅÔÓÑ 'sed':\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=óãåî       ÄÏÂÁ×ÉÔØ óãåî Ë ×ÙÐÏÌÎÑÅÍÙÍ ËÏÍÁÎÄÁÍ\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1642,14 +1652,14 @@ msgstr ""
 "  -f, --file=æáêì-óãåî        ÄÏÂÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÆÁÊÌÁ æáêì-óãåî Ë\n"
 "                                ×ÙÐÏÌÎÑÅÍÙÍ ËÏÍÁÎÄÁÍ\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       ×ÙËÌÀÞÉÔØ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÅÞÁÔØ ÏÂÒÁÚÃÁ\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1658,12 +1668,12 @@ msgstr ""
 "                                escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ÑÚÙËÁ C (ÐÏ "
 "ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ ×Ù×ÏÄÅ ÏÔÓÔÕÐÙ\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1671,69 +1681,50 @@ msgstr ""
 "      --keep-header           ÓÏÈÒÁÎÉÔØ ÚÁÇÏÌÏ×ÏË ËÁË ÅÓÔØ, ÎÅ ÆÉÌØÔÒÏ×ÁÔØ "
 "ÅÇÏ\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "åÝÅ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÏ."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"ÎÅ×ÏÚÍÏÖÎÏ ÏÒÇÁÎÉÚÏ×ÁÔØ ÎÅÂÌÏËÉÒÕÀÝÉÊ ××ÏÄ/×Ù×ÏÄ ÄÌÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "ÐÏÐÙÔËÁ Ó×ÑÚÉ Ó ÄÏÞÅÒÎÉÍ ÐÒÏÃÅÓÓÏÍ %s ÎÅÕÓÐÅÛÎÁ"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "ÞÔÅÎÉÅ ÏÔ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s ÎÅÕÓÐÅÛÎÁ"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "ÁÒÇÕÍÅÎÔ %s ÄÏÌÖÅÎ ÂÙÔØ ÏÄÉÎÏÞÎÙÍ ÐÕÎËÔÕÁÃÉÏÎÎÙÍ ÚÎÁËÏÍ"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "õÌØÒÉÈ äÒÅÐÐÅÒ"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-d ËÁÔÁÌÏÇ\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ \"-l ÌÏËÁÌØ\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s ÉÌÉ %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s, %s ÉÌÉ %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1741,7 +1732,7 @@ msgstr[0] "%d 
 msgstr[1] "%d ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÑ"
 msgstr[2] "%d ÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1749,7 +1740,7 @@ msgstr[0] ", %d 
 msgstr[1] ", %d ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÁ"
 msgstr[2] ", %d ÎÅÔÏÞÎÙÈ ÐÅÒÅ×ÏÄÏ×"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1757,17 +1748,17 @@ msgstr[0] ", %d 
 msgstr[1] ", %d ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÑ"
 msgstr[2] ", %d ÎÅÐÅÒÅ×ÅÄÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] ÉÍÑ-ÆÁÊÌÁ.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "óÏÚÄÁÅÔ Ä×ÏÉÞÎÙÊ ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÉÚ ÔÅËÓÔÏ×ÏÇÏ ÏÐÉÓÁÎÉÑ ÐÅÒÅ×ÏÄÏ×.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1776,17 +1767,17 @@ msgstr ""
 "áÒÇÕÍÅÎÔÙ, ÏÂÑÚÁÔÅÌØÎÙÅ ÄÌÑ ÄÌÉÎÎÙÈ ËÌÀÞÅÊ, ÏÂÑÚÁÔÅÌØÎÙ É ÄÌÑ ËÏÒÏÔËÉÈ.\n"
 "ôÏ ÖÅ É ÄÌÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  ÉÍÑ-ÆÁÊÌ.po ...             ×ÈÏÄÎÙÅ ÆÁÊÌÙ\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "òÅÖÉÍ ÒÁÂÏÔÙ:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1794,7 +1785,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  ÒÅÖÉÍ Java: ÓÏÚÄÁÅÔ Java-ËÌÁÓÓ ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1803,12 +1794,12 @@ msgstr ""
 "      --java2                 ËÁË --java, ÎÏ ÐÒÅÄÐÏÌÁÇÁÅÔ Java2 (JDK 1.2 ÉÌÉ "
 "×ÙÛÅ)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                ÒÅÖÉÍ C#: ÇÅÎÅÒÉÒÏ×ÁÔØ .dll-ÆÁÊÌ .NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1817,42 +1808,42 @@ msgstr ""
 "      --csharp-resources    ÒÅÖÉÍ ÒÅÓÕÒÓÏ× C#: ÇÅÎÅÒÉÒÏ×ÁÔØ .resources-ÆÁÊÌ ."
 "NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   ÒÅÖÉÍ Tcl: ÓÏÚÄÁÅÔ .msg-ÆÁÊÌ ÄÌÑ tcl/msgcat\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    ÒÅÖÉÍ Qt: ÇÅÎÅÒÉÒÏ×ÁÔØ .qm-ÆÁÊÌ Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                ÓÔÒÏÇÏ ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÔÁÎÄÁÒÔÕ Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "åÓÌÉ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÒÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=òåóõòó       ÉÍÑ ÒÅÓÕÒÓÁ\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1860,14 +1851,14 @@ msgid ""
 msgstr ""
 "  -l, --locale=ìïëáìø         ÉÍÑ ÌÏËÁÌÉ, ÜÔÏ ÌÉÂÏ ÑÚÙË, ÌÉÂÏ ÑÚÙË_óôòáîá\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ëáôáìïç                  ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÉÅÒÁÒÈÉÉ ËÁÔÁÌÏÇÏ× ËÌÁÓÓÏ×\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1880,12 +1871,12 @@ msgstr ""
 "ÚÎÁËÁ ÐÏÄÞÅÒËÉ×ÁÎÉÑ.  ëÌÀÞ -d ÏÂÑÚÁÔÅÌÅÎ.  ëÌÁÓÓ ÚÁÐÉÓÙ×ÁÅÔÓÑ × ÕËÁÚÁÎÎÙÊ\n"
 "ËÁÔÁÌÏÇ.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1894,7 +1885,7 @@ msgstr ""
 "  -d ëáôáôïç                 ÂÁÚÏ×ÙÊ ËÁÔÁÌÏÇ ÄÌÑ ÚÁ×ÉÓÑÝÉÈ ÏÔ ÌÏËÁÌÉ .dll-"
 "ÆÁÊÌÏ×\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1904,17 +1895,17 @@ msgstr ""
 "ÐÏÄËÁÔÁÌÏÇ ÕËÁÚÁÎÎÏÇÏ ËÁÔÁÌÏÇÁ, ÉÍÑ ÜÔÏÇÏ ÐÏÄËÁÔÁÌÏÇÁ ÚÁ×ÉÓÉÔ ÏÔ\n"
 "ÌÏËÁÌÉ.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d ëáôáìïç                  ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÉÅÒÁÒÈÉÉ .msg-ÆÁÊÌÏ×\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1923,12 +1914,12 @@ msgstr ""
 "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ.  ÷ÙÈÏÄÎÏÊ .msg-ÆÁÊÌ ÚÁÐÉÓÙ×ÁÅÔÓÑ × ÕËÁÚÁÎÎÙÊ "
 "ËÁÔÁÌÏÇ.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "éÎÔÅÒÐÒÅÔÁÃÉÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1940,13 +1931,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          ÐÒÏ×ÅÒÉÔØ ÚÁ×ÉÓÑÝÉÅ ÏÔ ÑÚÙËÁ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1954,7 +1945,7 @@ msgid ""
 msgstr ""
 "      --check-header          ÐÒÏ×ÅÒÉÔØ ÎÁÌÉÞÉÅ É ÓÏÄÅÒÖÉÍÏÅ ÚÁÇÏÌÏ×ËÁ\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1964,7 +1955,7 @@ msgstr ""
 "ÄÏÍÅÎÁ \n"
 "                                É ËÌÀÞÏÍ --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1973,7 +1964,7 @@ msgstr ""
 "  -C, --check-compatibility   ÐÒÏ×ÅÒÉÔØ, ÞÔÏ GNU msgfmt ×ÅÄÅÔ ÓÅÂÑ ÔÁË ÖÅ, \n"
 "                                ËÁË X/Open msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1984,13 +1975,13 @@ msgstr ""
 "ÜË×É×ÁÌÅÎÔÏ× \n"
 "                                ÄÌÑ ÐÕÎËÔÏ× ÍÅÎÀ\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ ×Ù×ÏÄÅ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -1998,89 +1989,89 @@ msgstr ""
 "  -a, --alignment=þéóìï       ×ÙÒÁ×ÎÉ×ÁÔØ ÓÔÒÏËÉ ÐÏ þéóìõ ÂÁÊÔ (ÐÏ "
 "ÕÍÏÌÞÁÎÉÀ: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               Ä×ÏÉÞÎÙÊ ÆÁÊÌ ÎÅ ÂÕÄÅÔ ×ËÌÀÞÁÔØ ÈÜÛ-ÔÁÂÌÉÃÕ\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ÎÁÐÅÞÁÔÁÔØ ÓÔÁÔÉÓÔÉËÕ Ï ÐÅÒÅ×ÏÄÁÈ\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               Õ×ÅÌÉÞÉÔØ ÐÏÄÒÏÂÎÏÓÔØ ÄÉÁÇÎÏÓÔÉÞÅÓËÉÈ "
 "ÓÏÏÂÝÅÎÉÊ\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÏÔÓÕÔÓÔ×ÕÅÔ ÉÌÉ ÎÅÐÒÁ×ÉÌÅÎ\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ËÏÄÉÒÏ×ÏË ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÚÁÇÏÌÏ×ÏË PO-ÆÁÊÌÁ ÐÏÍÅÞÅÎ ËÁË ÎÅÔÏÞÎÙÊ\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÂÏÌÅÅ ÓÔÁÒÙÅ ×ÅÒÓÉÉ msgfmt ×ÙÄÁÄÕÔ ÚÄÅÓØ ÏÛÉÂËÕ\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "ÉÍÑ ÄÏÍÅÎÁ \"%s\" ÎÅÄÏÐÕÓÔÉÍÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÆÁÊÌÁ, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÏ\n"
 "ÞÁÓÔÉÞÎÏ ÕÓÅÞÅÎÎÏÅ ÉÍÑ ÄÏÍÅÎÁ"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "ÄÉÒÅËÔÉ×Á `domain %s' ÉÇÎÏÒÉÒÏ×ÁÎÁ"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "ÐÕÓÔÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ÎÅÔÏÞÎÏÅ ×ÈÏÖÄÅÎÉÅ `msgstr' ÉÇÎÏÒÉÒÏ×ÁÎÏ"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÓÏÄÅÒÖÉÔ ÎÅÔÏÞÎÙÅ ÐÅÒÅ×ÏÄÙ"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2088,7 +2079,7 @@ msgid ""
 msgstr ""
 "ËÌÀÞ '%c' ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÏ ÔÏÇÏ, ËÁË ÚÁÄÁÎÙ 'J', 'K', 'T', 'C' ÉÌÉ 'X'"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2098,7 +2089,7 @@ msgstr ""
 "ÚÁÄÁÎÎÏÍÕ ÏÂÒÁÚÃÕ ÉÌÉ ÐÒÉÎÁÄÌÅÖÁÔ ÚÁÄÁÎÎÙÍ ÉÓÈÏÄÎÙÍ ÆÁÊÌÁÍ.\n"
 "\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2185,7 +2176,7 @@ msgstr ""
 "  -v, --invert-match          ×Ù×ÏÄÉÔØ ÔÏÌØËÏ ÓÏÏÂÝÅÎÉÑ, ËÏÔÏÒÙÅ ÎÅ\n"
 "                              ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÎÉ ÏÄÎÏÍÕ ËÒÉÔÅÒÉÀ ×ÙÂÏÒÁ\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2193,17 +2184,17 @@ msgstr ""
 "      --escape                ÉÓÐÏÌØÚÏ×ÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ, Á ÎÅ\n"
 "                                ÒÁÓÛÉÒÅÎÎÙÅ ÚÎÁËÉ\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ÓÏÒÔÉÒÏ×ÁÔØ ×Ù×ÏÄ ÐÏ ÉÍÅÎÁÍ ÆÁÊÌÏ×\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2213,7 +2204,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ ÓÒÅÄÙ LANG ËÁË ÏÐÉÓÁÎÏ × ÆÁÊÌÅ ABOUT-NLS.  üÔÏ\n"
 "ÎÅÏÂÈÏÄÉÍÏ, ÞÔÏÂÙ ×Ù ÍÏÇÌÉ ÐÒÏ×ÅÒÉÔØ Ó×ÏÉ ÐÅÒÅ×ÏÄÙ.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2224,12 +2215,12 @@ msgstr ""
 "ðÏÖÁÊÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÌÏËÁÌØ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --locale ÉÌÉ ×ÙÈÏÄÎÏÊ\n"
 "po-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "óÏÚÄÁÎÏ %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2238,12 +2229,12 @@ msgstr ""
 "óÏÚÄÁÅÔ ÎÏ×ÙÊ PO-ÆÁÊÌ, ÉÎÉÃÉÁÌÉÚÉÒÕÑ ÍÅÔÁÉÎÆÏÒÍÁÃÉÀ ÉÓÈÏÄÑ ÉÚ\n"
 "ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÒÅÄÙ.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=÷èïäîïê-æáêì    ×ÈÏÄÎÏÊ POT-ÆÁÊÌ\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2253,12 +2244,12 @@ msgstr ""
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÚÁÄÁÎ, ÏÎ ÉÝÅÔÓÑ × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ.\n"
 "åÓÌÉ ×ÈÏÄÎÏÊ ÆÁÊÌ ÚÁÄÁÎ ËÁË -, ÞÉÔÁÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=æáêì      ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2268,12 +2259,12 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÌÏËÁÌÉ.  åÓÌÉ ÏÎ ÚÁÄÁÎ ËÁË -, ÒÅÚÕÌØÔÁÔÙ ×Ù×ÏÄÑÔÓÑ ÎÁ\n"
 "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=ññ_óó          ÚÁÄÁÅÔ ÃÅÌÅ×ÕÀ ÌÏËÁÌØ\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2281,7 +2272,7 @@ msgstr ""
 "      --no-translator         ÐÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ PO-ÆÁÊÌ ÓÇÅÎÅÒÉÒÏ×ÁÎ "
 "Á×ÔÏÍÁÔÉÞÅÓËÉ\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2289,12 +2280,12 @@ msgstr ""
 "îÁÊÄÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ pot-ÆÁÊÌÁ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÔÅËÕÝÅÇÏ ËÁÔÁÌÏÇÁ"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2302,14 +2293,14 @@ msgstr ""
 "÷ ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ ÎÅ ÎÁÊÄÅÎ pot-ÆÁÊÌ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÏÊ pot-ÆÁÊÌ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2325,28 +2316,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "ÔÅËÕÝÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ Ä×Å ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ \"%s\" É \"%s\""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2355,19 +2346,19 @@ msgstr ""
 "ÄÏÍÅÎ \"%s\" ×Ï ×ÈÏÄÎÏÍ ÆÁÊÌÅ `%s' ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ "
 "ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ÃÅÌÅ×ÁÑ ËÏÄÉÒÏ×ËÁ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÐÅÒÅÎÏÓÉÍÙÍ ÉÍÅÎÅÍ ËÏÄÉÒÏ×ËÉ."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2376,7 +2367,7 @@ msgstr ""
 "÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ ×\n"
 "UTF-8.  ÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2384,12 +2375,12 @@ msgid ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ × %s É %"
-"s.\n"
+"÷ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÓÏÏÂÝÅÎÉÑ × ÒÁÚÎÙÈ ËÏÄÉÒÏ×ËÁÈ, × ÔÏÍ ÞÉÓÌÅ × %s É "
+"%s.\n"
 "÷Ù×ÏÄ ÐÒÅÏÂÒÁÚÕÅÔÓÑ Ë UTF-8.  þÔÏÂÙ ×ÙÂÒÁÔØ ÄÒÕÇÕÀ ×ÙÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ,\n"
 "ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2403,7 +2394,7 @@ msgstr ""
 "ÏÎÉ\n"
 "ÉÚÎÁÞÁÌØÎÏ ÐÒÅÄÓÔÁ×ÌÅÎÙ × UTF-8, ÎÁÐÒÉÍÅÒ × ÉÓÈÏÄÎÙÈ ÆÁÊÌÁÈ ÐÒÏÇÒÁÍÍÙ.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2415,12 +2406,12 @@ msgstr ""
 "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n"
 "÷ÏÚÍÏÖÎÙÅ ÍÅÔÏÄÙ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- õÓÔÁÎÏ×ÉÔØ LC_ALL ÒÁ×ÎÏÊ ÌÏËÁÌÉ Ó ËÏÄÉÒÏ×ËÏÊ %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2431,7 +2422,7 @@ msgstr ""
 "  ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n"
 "  ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2444,7 +2435,7 @@ msgstr ""
 "  ÚÁÔÅÍ ÐÒÉÍÅÎÉÔØ '%s',\n"
 "  ÚÁÔÅÍ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÏÂÒÁÔÎÏ Ë %s Ó ÐÏÍÏÝØÀ 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2455,26 +2446,26 @@ msgstr ""
 "÷Ù×ÏÄ '%s' ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÁ×ÉÌØÎÙÍ.\n"
 "÷ÏÚÍÏÖÎÙÊ ÍÅÔÏÄ ÏÂÏÊÔÉ ÜÔÕ ÓÉÔÕÁÃÉÀ -- ÕÓÔÁÎÏ×ÉÔØ LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÏÔÒÉÃÁÔÅÌØÎÙÅ ÚÎÁÞÅÎÉÑ"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ÎÏ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÚÎÁÞÅÎÉÑ ÄÏ "
 "%lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁÔØ ÐÅÒÅÐÏÌÎÉÅ ÃÅÌÏÇÏ"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2482,37 +2473,37 @@ msgstr ""
 "×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ ÍÏÖÅÔ ÄÁ×ÁÔØ ÉÓËÌÀÞÉÔÅÌØÎÙÅ ÓÉÔÕÁÃÉÉ × "
 "ÁÒÉÆÍÅÔÉËÅ, ×ÏÚÍÏÖÎÏ, ÄÅÌÅÎÉÅ ÎÁ ÎÏÌØ"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "ðÏÐÒÏÂÕÊÔÅ ÓÌÅÄÕÀÝÅÅ, ÐÏÄÈÏÄÉÔ ÄÌÑ %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"plural=÷ùòáöåîéå\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ÎÏ × ÚÁÇÏÌÏ×ËÅ ÎÅÔ ÁÔÒÉÂÕÔÁ \"nplurals=ãåìïå\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ÎÅ×ÅÒÎÁÑ ÚÎÁÞÅÎÉÅ nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ÎÅ×ÅÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2520,7 +2511,7 @@ msgstr[0] "
 msgstr[1] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÔÏÌØËÏ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2528,7 +2519,7 @@ msgstr[0] "
 msgstr[1] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 msgstr[2] "ÎÏ × ÎÅËÏÔÏÒÙÈ ÓÏÏÂÝÅÎÉÑÈ ÅÓÔØ %lu ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2536,93 +2527,94 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ × ÎÅÍ "
 "ÚÁÇÏÌÏ×ËÁ Ó \"Plural-Forms: nplurals=ãåìïå; plural=÷ùòáöåîéå;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË "
 "ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÎÁÞÉÎÁÅÔÓÑ Ó '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- "
 "ÎÅÔ"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgid_plural' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr[%u]' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ "
 "-- ÎÅÔ"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "ÏÄÎÏ ÉÚ ÐÏÌÅÊ `msgid' ÉÌÉ `msgstr' ÚÁ×ÅÒÛÁÅÔÓÑ '\\n', ÔÏÇÄÁ ËÁË ÄÒÕÇÏÅ -- ÎÅÔ"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "ÏÂÒÁÂÏÔËÁ ÆÏÒÍ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Ñ×ÌÑÅÔÓÑ ÒÁÓÛÉÒÅÎÉÅÍ GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "× msgstr ÎÅÄÏÓÔÁÅÔ ÏÔÍÅÔËÉ ËÌÁ×ÉÁÔÕÒÎÏÇÏ ÜË×É×ÁÌÅÎÔÁ '%c'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "× msgstr ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÔÍÅÔÏË ËÌÁ×ÉÁÔÕÒÎÙÈ ÜË×É×ÁÌÅÎÔÏ× '%c'"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "× ÚÁÇÏÌÏ×ËÅ ÐÒÏÐÕÝÅÎÏ ÐÏÌÅ `%s'\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÎÏ×ÏÊ ÓÔÒÏËÉ\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 "ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr ""
+"ÎÅËÏÔÏÒÙÅ ÐÏÌÑ ÚÁÇÏÌÏ×ËÁ ×ÓÅ ÅÝÅ ÉÍÅÀÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ×ÈÏÄ ÄÌÑ ËÏÄÉÒÏ×ËÉ \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÉ ÉÚ ËÏÄÉÒÏ×ËÉ \"%s\" × ËÏÄÉÒÏ×ËÕ \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ Ó ÏÐÉÓÁÎÉÅÍ ËÏÄÉÒÏ×ËÉ"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2631,7 +2623,7 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\".  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv(), ÎÏ "
 "iconv() ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2640,8 +2632,8 @@ msgstr ""
 "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ \"%s\" × \"%s\" ÐÏÒÏÖÄÁÅÔ ÄÕÂÌÉËÁÔÙ: ÎÅËÏÔÏÒÙÅ "
 "ÒÁÚÌÉÞÁÀÝÉÅÓÑ ÏÒÉÇÉÎÁÌÙ ÓÏÏÂÝÅÎÉÊ ÓÔÁÎÏ×ÑÔÓÑ ÏÄÉÎÁËÏ×ÙÍÉ."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2650,16 +2642,16 @@ msgstr ""
 "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ÉÚ \"%s\" × \"%s\".  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ iconv().  üÔÁ "
 "×ÅÒÓÉÑ ÂÙÌÁ ÓÏÂÒÁÎÁ ÂÅÚ iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ Ó %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "ÔÉÐ ÒÅÚÅÒ×ÎÏÇÏ ËÏÐÉÒÏ×ÁÎÉÑ"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2684,18 +2676,18 @@ msgstr ""
 "ÉÓÐÏÌØÚÕÅÔÓÑ ÐÒÉÂÌÉÚÉÔÅÌØÎÏÅ ÓÒÁ×ÎÅÎÉÅ, ÅÓÌÉ ÎÅÌØÚÑ ÎÁÊÔÉ ÔÏÞÎÏÅ\n"
 "ÓÏ×ÐÁÄÅÎÉÅ.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      ÐÅÒÅ×ÏÄÙ, ÓÓÙÌÁÀÝÉÅÓÑ ÎÁ ÓÔÁÒÙÅ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ÓÓÙÌËÉ ÎÁ ÎÏ×ÙÅ ÉÓÈÏÄÎÉËÉ\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2705,7 +2697,7 @@ msgstr ""
 "ÓÏÏÂÝÅÎÉÊ, \n"
 "                              ÍÏÖÎÏ ÕËÁÚÙ×ÁÔØ ÎÅÓËÏÌØËÏ ÒÁÚ\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2714,28 +2706,28 @@ msgstr ""
 "  -U, --update                ÏÂÎÏ×ÉÔØ def.po,\n"
 "                              ÎÉÞÅÇÏ ÎÅ ÄÅÌÁÔØ, ÅÓÌÉ def.po ÕÖÅ ÏÂÎÏ×ÌÅÎ\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ ÏÂÎÏ×ÌÅÎÉÑ:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "òÅÚÕÌØÔÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ ÏÂÒÁÔÎÏ × def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=íåôïä          ÓÄÅÌÁÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=óõææéëó        ÐÅÒÅËÒÙÔØ ÏÂÙÞÎÙÊ ÓÕÆÆÉËÓ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2754,7 +2746,7 @@ msgstr ""
 "  simple, never   ×ÓÅÇÄÁ ÄÅÌÁÔØ ÐÒÏÓÔÙÅ ÒÅÚÅÒ×ÎÙÅ ËÏÐÉÉ\n"
 "\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2765,12 +2757,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎ ÉÎÏÊ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --suffix ÉÌÉ ÐÅÒÅÍÅÎÎÏÊ ÓÒÅÄÙ\n"
 "SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     ÎÅ ÐÒÉÍÅÎÑÔØ ÎÅÞÅÔËÏÅ ÓÏÐÏÓÔÁ×ÌÅÎÉÅ\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2778,22 +2765,22 @@ msgstr ""
 "      --previous              ÓÏÈÒÁÎÉÔØ ÐÒÅÄÙÄÕÝÉÅ msgid ÐÅÒÅ×ÅÄÅÎÎÙÈ "
 "ÓÏÏÂÝÅÎÉÊ\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       ÎÅ ×Ù×ÏÄÉÔØ ÉÎÄÉËÁÔÏÒ ÐÒÏÇÒÅÓÓÁ\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ÄÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÄÏÌÖÎÏ ÏÐÒÅÄÅÌÑÔØ ÆÏÒÍÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2802,26 +2789,28 @@ msgstr ""
 "%sðÒÏÞÉÔÁÎÏ ÓÏÏÂÝÅÎÉÊ: ÓÔÁÒÙÈ %ld + ÎÏ×ÙÈ %ld; ÏÂßÅÄÉÎÅÎÏ %ld, ÐÏÍÅÞÅÎÏ "
 "ÎÅÔÏÞÎÙÍÉ %ld, ÎÅÄÏÓÔÁÀÝÉÈ %ld, ÎÅÄÅÊÓÔ×ÉÔÅÌØÎÙÈ %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " ÚÁ×ÅÒÛÅÎÏ.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s É Ñ×ÎÏ ÚÁÄÁÎÎÏÅ ÉÍÑ ÆÁÊÌÁ ×ÚÁÉÍÎÏ ÉÓËÌÀÞÁÀÔ ÄÒÕÇ ÄÒÕÇÁ"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] [æáêì]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "ðÒÅÏÂÒÁÚÕÅÔ Ä×ÏÉÞÎÙÊ ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ × .po-ÆÁÊÌ × ÓÔÉÌÅ Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2830,12 +2819,12 @@ msgstr ""
 "  -j, --java                  ÒÅÖÉÍ Java: ÎÁ ×ÈÏÄÅ Java-ËÌÁÓÓ "
 "ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                ÒÅÖÉÍ C#: ÎÁ ×ÈÏÄÅ .dll-ÆÁÊÌ .NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2844,24 +2833,24 @@ msgstr ""
 "      --csharp-resources      ÒÅÖÉÍ ÒÅÓÕÒÓÏ× C#: ÎÁ ×ÈÏÄÅ .resources-ÆÁÊÌ ."
 "NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   ÒÅÖÉÍ Tcl: ÎÁ ×ÈÏÄÅ .msg-ÆÁÊÌ ÄÌÑ tcl/msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  æáêì ...                    ×ÈÏÄÎÙÅ .mo-ÆÁÊÌÙ\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2871,12 +2860,12 @@ msgstr ""
 "éÍÑ ËÌÁÓÓÁ ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÕÔÅÍ ÄÏÂÁ×ÌÅÎÉÑ ÉÍÅÎÉ ÌÏËÁÌÉ Ë ÉÍÅÎÉ ÒÅÓÕÒÓÁ ÐÏÓÌÅ\n"
 "ÚÎÁËÁ ÐÏÄÞÅÒËÉ×ÁÎÉÑ.  ëÌÁÓÓ ÉÝÅÔÓÑ Ó ÐÏÍÏÝØÀ CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2885,12 +2874,12 @@ msgstr ""
 "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ.  ÷ÈÏÄÎÏÊ .dll-ÆÁÊÌ ÉÝÅÔÓÑ × ÐÏÄËÁÔÁÌÏÇÅ\n"
 "ÕËÁÚÁÎÎÏÇÏ ËÁÔÁÌÏÇÁ, ÉÍÑ ÜÔÏÇÏ ÐÏÄËÁÔÁÌÏÇÁ ÚÁ×ÉÓÉÔ ÏÔ ÌÏËÁÌÉ.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "îÁÈÏÖÄÅÎÉÅ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÒÅÖÉÍÅ Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2898,19 +2887,19 @@ msgid ""
 msgstr ""
 "ëÌÀÞÉ -l É -d ÏÂÑÚÁÔÅÌØÎÙ.  ÷ÈÏÄÎÏÊ .msg-ÆÁÊÌ ÉÝÅÔÓÑ × ÕËÁÚÁÎÎÏÍ ËÁÔÁÌÏÇÅ.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ ×Ù×ÏÄÅ ÏÔÓÔÕÐÙ\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                ×Ù×ÏÄÉÔØ × ÓÔÒÏÇÏÍ ÓÏÏÔ×ÅÔÓÔ×ÉÉ ÓÔÁÎÄÁÒÔÕ "
 "Uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2933,12 +2922,12 @@ msgstr ""
 "ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÌÀÞÁ --unique, ÏÔÂÒÁÓÙ×ÁÀÔÓÑ ÄÕÂÌÉÒÏ×ÁÎÎÙÅ\n"
 "ÓÏÏÂÝÅÎÉÑ.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÄÕÂÌÉËÁÔÙ\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2947,7 +2936,7 @@ msgstr ""
 "  -u, --unique                ÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÕÎÉËÁÌØÎÙÅ, ÐÒÏÐÕÓËÁÑ "
 "ÄÕÂÌÉËÁÔÙ\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ>"
@@ -3033,66 +3022,66 @@ msgstr "
 msgid "plural form has wrong index"
 msgstr "ÆÏÒÍÁ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ ÞÉÓÌÁ ÉÍÅÅÔ ÎÅÐÒÁ×ÉÌØÎÙÊ ÉÎÄÅËÓ"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ÎÅ×ÅÒÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ÎÅÐÏÌÎÁÑ ÍÎÏÇÏÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "×ÙÚÏ× iconv ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "ÎÅ×ÅÒÎÁÑ ÕÐÒÁ×ÌÑÀÝÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "ÓÉÍ×ÏÌ ËÏÎÃÁ ÓÔÒÏËÉ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "ÒÁÚÄÅÌÉÔÅÌØ ËÏÎÔÅËÓÔÁ <EOT> ×ÎÕÔÒÉ ÓÔÒÏËÉ"
 
 # ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏËÁ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ÜÔÏÔ ÆÁÊÌ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÉÒÅËÔÉ×Ù ÄÏÍÅÎÁ"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "ÍÅÓÔÏ ÐÏÑ×ÌÅÎÉÑ ÐÅÒ×ÏÇÏ ÏÐÒÅÄÅÌÅÎÉÑ"
 
@@ -3178,17 +3167,17 @@ msgstr "
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÉ ÉÚ ËÏÄÉÒÏ×ËÉ \"%s\" × ËÏÄÉÒÏ×ËÕ \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "ÏÖÉÄÁÅÔÓÑ Ä×Á ÁÒÇÕÍÅÎÔÁ"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ] URL æáêì\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3197,11 +3186,26 @@ msgstr ""
 "ðÏÌÕÞÁÅÔ É ×Ù×ÏÄÉÔ ÓÏÄÅÒÖÉÍÏÅ ÚÁÄÁÎÎÏÇÏ URL.  åÓÌÉ Ë URL ÎÅ×ÏÚÍÏÖÎÏ\n"
 "ÐÏÌÕÞÉÔØ ÄÏÓÔÕÐ, ×ÍÅÓÔÏ ÎÅÇÏ ÉÓÐÏÌØÚÕÅÔÓÑ ÕËÁÚÁÎÎÙÊ ÌÏËÁÌØÎÙÊ æáêì.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3244,43 +3248,43 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ, ÎÏ ×ÙÈÏÄÎÏÊ "
 "ÆÏÒÍÁÔ ÉÈ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ ×Ù×ÏÄÁ \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "ËÏÍÐÉÌÑÃÉÑ C#-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "ËÏÍÐÉÌÑÃÉÑ C#-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ÉÍÅÎÅÍ ËÌÁÓÓÁ Java"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "ËÏÍÐÉÌÑÃÉÑ Java-ËÌÁÓÓÁ ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ, ÐÏÐÒÏÂÕÊÔÅ --verbose ÉÌÉ "
 "ÕÓÔÁÎÏ×ÉÔÅ $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3292,14 +3296,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ \"%s\" ÄÌÑ ÚÁÐÉÓÉ"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "ðÅÒÅ×ÏÄÉÍÙÅ ÓÏÏÂÝÅÎÉÑ ÎÅ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ `\\%c'"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3312,7 +3316,7 @@ msgstr ""
 "ËÏÄÉÒÏ×ËÕ, ÞÔÏ É ×Ù.  ðÏÄÕÍÁÊÔÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ × msgctxt ÞÉÓÔÏÊ ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3336,8 +3340,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3360,7 +3364,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ ÄÏÞÅÒÎÅÍÕ ÐÒÏÃÅÓÓÕ \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3368,7 +3372,7 @@ msgstr ""
 "ËÁÔÁÌÏÇ ÓÏÏÂÝÅÎÉÊ ÓÏÄÅÒÖÉÔ ÐÅÒÅ×ÏÄÙ Ó ËÏÎÔÅËÓÔÏÍ, ÎÏ ÆÏÒÍÁÔ\n"
 ".resources C# ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ËÏÎÔÅËÓÔÙ\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3393,36 +3397,34 @@ msgstr ""
 "ËÁÔÁÌÏÇÏ× ÓÏÏÂÝÅÎÉÊ ÄÌÑ Tcl ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÒÁÂÏÔËÕ ÍÎÏÖÅÓÔ×ÅÎÎÏÇÏ\n"
 "ÞÉÓÌÁ\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÉÍ×ÏÌØÎÁÑ ËÏÎÓÔÁÎÔÁ"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "îÅ-ASCII-ÓÔÒÏËÁ × %s%s.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3431,7 +3433,7 @@ msgstr ""
 "%s:%d: îÅ×ÅÒÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3440,7 +3442,7 @@ msgstr ""
 "%s:%d: äÌÉÎÎÁÑ ÎÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3449,7 +3451,7 @@ msgstr ""
 "%s:%d: îÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÆÁÊÌÁ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3458,12 +3460,12 @@ msgstr ""
 "%s:%d: îÅÐÏÌÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ × ËÏÎÃÅ ÓÔÒÏËÉ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ×ÙÚÏ× iconv ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÓÐÅÈÏÍ"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3472,32 +3474,32 @@ msgstr ""
 "%s:%d: îÅ×ÅÒÎÁÑ ÍÕÌØÔÉÂÁÊÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ.\n"
 "ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ×ÈÏÄÎÕÀ ËÏÄÉÒÏ×ËÕ Ó ÐÏÍÏÝØÀ ËÌÀÞÁ --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÅÒÎÙÊ Unicode-ÚÎÁË"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÏ×ÁÑ ËÏÎÓÔÁÎÔÁ"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×ÓÔÒÅÞÅÎÁ ')', ÇÄÅ ÏÖÉÄÁÅÔÓÑ '}'"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×ÓÔÒÅÞÅÎÁ '}', ÇÄÅ ÏÖÉÄÁÅÔÓÑ ')'"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3506,51 +3508,50 @@ msgstr ""
 "ñÚÙË \"glade\" ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.  %s ÐÏÌÁÇÁÅÔÓÑ ÎÁ expat.\n"
 "üÔÁ ×ÅÒÓÉÑ ÓÏÂÒÁÎÁ ÂÅÚ expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÚÁ×ÅÒÛÅÎÎÁÑ ÓÔÒÏËÁ"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÏÇÒÁÎÉÞÉÔÅÌØ ÓÔÒÏËÉ \"%s\" ×ÐÌÏÔØ ÄÏ ËÏÎÃÁ ÆÁÊÌÁ"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ × \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\l\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\u\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ ÐÅÒÅÍÅÎÎÏÊ × \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\L\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ÎÅ×ÅÒÎÁÑ ÉÎÔÅÒÐÏÌÑÃÉÑ (\"\\U\") ×ÏÓØÍÉÂÉÔÎÏÇÏ ÚÎÁËÁ \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3559,7 +3560,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3571,7 +3572,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3583,7 +3584,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3595,7 +3596,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3607,7 +3608,7 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3619,27 +3620,27 @@ msgstr ""
 "ÐÏÍÏÝØÀ\n"
 "ËÏÍÍÅÎÔÁÒÉÑ ËÁË ÏÐÉÓÁÎÏ ÎÁ http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "ëÏÄÉÒÏ×ËÁ \"%s\" ÎÅÉÚ×ÅÓÔÎÁ.  ðÒÏÄÏÌÖÅÎÉÅ ÒÁÂÏÔÙ Ó ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÔÒÏËÉ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: ÐÒÏÐÕÝÅÎÏ ÞÉÓÌÏ ÐÏÓÌÅ #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ÎÅ×ÅÒÎÏÅ ÓÔÒÏËÏ×ÏÅ ×ÙÒÁÖÅÎÉÅ"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3648,29 +3649,29 @@ msgstr ""
 "%s:%lu: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÉÎÔÁËÓÉÓ $\"...\" ÚÁÐÒÅÝÅÎ ÐÏ ÓÏÏÂÒÁÖÅÎÉÑÍ "
 "ÂÅÚÏÐÁÓÎÏÓÔÉ; ÉÓÐÏÌØÚÕÊÔÅ eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "ËÌÀÞ --join-existing ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÚÁÐÉÓÉ × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ÎÅ ÍÏÖÅÔ ÒÁÂÏÔÁÔØ, ÎÅ ÚÎÁÑ ÉÓËÏÍÙÈ ËÌÀÞÅ×ÙÈ ÓÌÏ×"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ `%s' ÉÍÅÅÔ ÎÅÉÚ×ÅÓÔÎÏÅ ÒÁÓÛÉÒÅÎÉÅ `%s'; ÔÒÁËÔÕÅÔÓÑ ËÁË C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "éÚ×ÌÅËÁÅÔ ÐÅÒÅ×ÏÄÉÍÙÅ ÓÔÒÏËÉ ÉÚ ÕËÁÚÁÎÎÙÈ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3678,23 +3679,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=éíñ    ×Ù×ÏÄÉÔØ × ÆÁÊÌ éíñ.po (×ÍÅÓÔÏ messages.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=æáêì           ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=ëáô        ÐÏÍÅÓÔÉÔØ ×ÙÈÏÄÎÙÅ ÆÁÊÌÙ × ËÁÔÁÌÏÇ ëáô\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "÷ÙÂÏÒ ÑÚÙËÁ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3713,19 +3714,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   ÓÉÎÏÎÉÍ --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÑÚÙË ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏ ÒÁÓÛÉÒÅÎÉÀ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3734,42 +3735,45 @@ msgstr ""
 "      --from-code=éíñ            ËÏÄÉÒÏ×ËÁ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "                                   (ËÒÏÍÅ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ ÓÞÉÔÁÅÔÓÑ, ÞÔÏ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÓÏÄÅÒÖÁÔ ÔÏÌØËÏ ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ÓÌÉÔØ ÓÏÏÂÝÅÎÉÑ Ó ÓÕÝÅÓÔ×ÕÀÝÉÍ ÆÁÊÌÏÍ\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=æáêì.po  ÎÅ ÉÚ×ÌÅËÁÔØ ×ÈÏÖÄÅÎÉÑ ÉÚ æáêìá.po\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ôåç]    ÚÁÐÉÓÁÔØ × ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÂÌÏË ËÏÍÍÅÎÔÁÒÉÑ Ó\n"
 "                              ôåçïí (ÉÌÉ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÍÉ\n"
 "                              ËÌÀÞÅ×ÏÊ ÓÔÒÏËÅ)\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ëÌÀÞÉ ÄÌÑ ËÏÎËÒÅÔÎÙÈ ÑÚÙËÏ×:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ÉÚ×ÌÅÞØ ×ÓÅ ÓÔÒÏËÉ\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3782,17 +3786,17 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=óìï÷ï]       ÄÏÐÏÌÎÉÔÅÌØÎÏÅ ËÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÄÌÑ ÐÏÉÓËÁ (ÂÅÚ\n"
 "                              ÚÁÄÁÎÉÑ óìï÷á ÏÂÏÚÎÁÞÁÅÔ, ÞÔÏ ÎÅ ÎÕÖÎÏ \n"
 "                              ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3803,7 +3807,7 @@ msgstr ""
 "ÁÒÇÕÍÅÎÔÁ\n"
 "                              ÎÏÍÅÒ áòç ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á óìï÷ï\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3816,37 +3820,37 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ÐÏÎÉÍÁÔØ ÎÁ ×ÈÏÄÅ ÔÒÉÇÒÁÆÙ ANSI C\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (ÔÏÌØËÏ ÑÚÙËÉ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (ÔÏÌØËÏ ÑÚÙË C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Qt\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 ÒÁÓÐÏÚÎÁ×ÁÔØ ÆÏÒÍÁÔÎÙÅ ÓÔÒÏËÉ Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3854,19 +3858,19 @@ msgstr ""
 "      --debug                 ÂÏÌÅÅ ÐÏÄÒÏÂÎÙÊ ÒÅÚÕÌØÔÁÔ ÒÁÚÂÏÒÁ ÆÏÒÍÁÔÎÏÊ "
 "ÓÔÒÏËÉ\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     ÚÁÐÉÓÁÔØ .properties-ÆÁÊÌ Java\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=óôòïëá\n"
 "                      ÚÁÄÁÅÔ ÎÁÉÍÅÎÏ×ÁÎÉÅ ÏÂÌÁÄÁÔÅÌÑ Á×ÔÏÒÓËÉÈ ÐÒÁ×\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3874,19 +3878,19 @@ msgstr ""
 "      --foreign-user          ÎÅ ×Ù×ÏÄÉÔØ Õ×ÅÄÏÍÌÅÎÉÅ Ï Á×ÔÏÒÓËÉÈ ÐÒÁ×ÁÈ "
 "FSF\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=óôòïëá\n"
 "                      ÚÁÄÁÅÔ ÎÁÉÍÅÎÏ×ÁÎÉÅ ÏÂÌÁÄÁÔÅÌÑ Á×ÔÏÒÓËÉÈ ÐÒÁ×\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3895,45 +3899,62 @@ msgstr ""
 "                      ÚÁÄÁÅÔ ÁÄÒÅÓ, ËÕÄÁ ÓÌÅÄÕÅÔ ÏÔÐÒÁ×ÌÑÔØ ÏÔÞÅÔ Ï "
 "ÏÛÉÂËÁÈ\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=óôòïëá]\n"
 "                      ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÐÒÅÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ "
 "msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=óôòïëá]\n"
 "                      ÉÓÐÏÌØÚÏ×ÁÔØ óôòïëõ ÉÌÉ \"\" ËÁË ÓÕÆÆÉËÓ Ë ×ÈÏÖÄÅÎÉÑÍ "
 "msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "áÒÇÕÍÅÎÔ --flag ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÉÎÔÁËÓÉÓÕ <ËÌÀÞÅ×ÏÅ-ÓÌÏ×Ï>:<ÎÏÍÅÒ-ÁÒÇ>:"
 "[pass-]<ÆÌÁÇ>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3942,16 +3963,16 @@ msgstr ""
 "îÅÓÍÏÔÒÑ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ × ÍÅÓÔÅ, ÇÄÅ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÆÏÒÍÁÔÎÁÑ ÓÔÒÏËÁ, %s "
 "ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s.  ðÒÉÞÉÎÁ: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "óÔÒÏËÁ %s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÏÊ ÆÏÒÍÁÔÎÏÊ ÓÔÒÏËÏÊ %s, ÈÏÔÑ É ÏÂßÑ×ÌÅÎÁ ËÁË "
 "ÔÁËÏ×ÁÑ.  ðÒÉÞÉÎÁ: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3965,7 +3986,7 @@ msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ ÆÏÒÍÁÔÎÕÀ ÓÔÒÏËÕ Ó ÉÍÅÎÏ×ÁÎÎÙÍÉ ÁÒÇÕÍÅÎÔÁÍÉ É\n"
 "ÏÔÏÂÒÁÖÅÎÉÅ ×ÍÅÓÔÏ ËÏÒÔÅÖÁ ÄÌÑ ÁÒÇÕÍÅÎÔÏ×.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3975,29 +3996,29 @@ msgstr ""
 "gettext(\"\") ×ÏÚ×ÒÁÝÁÅÔ ÔÅËÓÔ ÚÁÇÏÌÏ×ËÁ Ó ÍÅÔÁÉÎÆÏÒÍÁÃÉÅÊ,\n"
 "Á ÎÅ ÐÕÓÔÕÀ ÓÔÒÏËÕ.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ÎÅÏÄÎÏÚÎÁÞÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ ÁÒÇÕÍÅÎÔÁ ÄÌÑ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕËÁÚÁÎ ËÏÎÔÅËÓÔ ÄÌÑ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕËÁÚÁÎ ËÏÎÔÅËÓÔ ÄÌÑ ÁÒÇÕÍÅÎÔÁ ×Ï ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ Õ "
 "ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á '%.*s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ÎÅ ÓÏ×ÐÁÄÁÀÔ ËÏÎÔÅËÓÔÙ Õ ÆÏÒÍ × ÅÄÉÎÓÔ×ÅÎÎÏÍ É ÍÎÏÖÅÓÔ×ÅÎÎÏÍ ÞÉÓÌÅ"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4008,7 +4029,7 @@ msgstr ""
 "`Makevars', ÕÓÔÁÎÏ×ÉÔÅ × ÎÅÍ ÐÅÒÅÍÅÎÎÕÀ MSGID_BUGS_ADDRESS, ×\n"
 "ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÚÁÄÁÊÔÅ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ËÌÀÞ --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "ÑÚÙË `%s' ÎÅÉÚ×ÅÓÔÅÎ"
@@ -4017,6 +4038,33 @@ msgstr "
 msgid "<unnamed>"
 msgstr "<ÂÅÚ ÉÍÅÎÉ>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr ""
+#~ "ÏÐÅÒÁÃÉÑ DuplicateHandle ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÈÏÍ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "åÝÅ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÏ."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "ÎÅ×ÏÚÍÏÖÎÏ ÏÒÇÁÎÉÚÏ×ÁÔØ ÎÅÂÌÏËÉÒÕÀÝÉÊ ××ÏÄ/×Ù×ÏÄ ÄÌÑ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "ÐÏÐÙÔËÁ Ó×ÑÚÉ Ó ÄÏÞÅÒÎÉÍ ÐÒÏÃÅÓÓÏÍ %s ÎÅÕÓÐÅÛÎÁ"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "ÞÔÅÎÉÅ ÏÔ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ %s ÎÅÕÓÐÅÛÎÁ"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ %s ÚÁ×ÅÒÛÉÌÓÑ Ó ×ÙÈÏÄÎÙÍ ËÏÄÏÍ %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr ""
+#~ "ÐÏÌÅ ÚÁÇÏÌÏ×ËÁ `%s' ×ÓÅ ÅÝÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÅ ÛÁÂÌÏÎÎÏÅ ÚÎÁÞÅÎÉÅ\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "íÎÏÖÅÓÔ×ÅÎÎÙÅ ÓÓÙÌËÉ ÎÁ %%%c."
 

diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index ffc9f73b74d223e45718daa6b762bde3646125d9..9295a089e8d1d2f196266658d58b9e581ac613ea 100644 (file)
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-07-19 22:52+0200\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-07-27 22:48+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -33,22 +33,22 @@ msgstr "nejednoznačný parameter %s pre %s"
 msgid "Valid arguments are:"
 msgstr "Platné parametre sú:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "nemožno nájsť dočasný adresár, skúste nastaviť $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "nemožno vytvoriť dočasný adresár so šablónou \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "nemožno odstrániť dočasný súbor %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "nemožno odstrániť dočasný adresár %s"
@@ -57,37 +57,37 @@ msgstr "nemožno odstrániť dočasný adresár %s"
 msgid "write error"
 msgstr "chyba zápisu"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1831 src/xgettext.c:1844
-#: src/xgettext.c:1854
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "nemožno otvoriť záložný súbor \"%s\" na zápis"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:228
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "chyba pri čítaní \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "chyba pri zápise \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:238
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "chyba po čítaní \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:845
-#: src/msginit.c:920 src/msginit.c:1080 src/msginit.c:1179
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,74 +104,73 @@ msgstr "Kompilátor C# nebol nájdený. Skúste nainštalovať pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
 
-#: gnulib-lib/error.c:127
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:235
-#: gnulib-lib/pipe.c:348 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces zlyhal"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: voľba `%s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba `--%s' nepovoľuje parameter\n"
 
-#: gnulib-lib/getopt.c:588 gnulib-lib/getopt.c:593
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba `%c%s' nepovoľuje parameter\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"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: voľba `%s' vyžaduje parameter\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neznáma voľba `--%s'\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neznáma voľba `%c%s'\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neprípustná voľba -- %c\n"
-
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neplatná voľba -- %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"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje parameter -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba `-W %s' nie je jednoznačná\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba `-W %s' nedovoľuje použitie parametra\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: voľba `%s' vyžaduje parameter\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,14 +182,14 @@ msgstr "neplatný parameter source_version pre compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neplatný parameter target_version pre compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -209,8 +208,8 @@ msgstr ""
 "Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:853 src/msginit.c:928
-#: src/msginit.c:1088
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
@@ -222,8 +221,8 @@ msgstr "V/V chyba podprocesu %s"
 msgid "memory exhausted"
 msgstr "pamäť je vyčerpaná"
 
-#: gnulib-lib/pipe.c:139 gnulib-lib/pipe.c:144 gnulib-lib/pipe.c:264
-#: gnulib-lib/pipe.c:267
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "nemožno vytvoriť rúru"
@@ -241,31 +240,26 @@ msgstr "nemožno vytvoriť rúru"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:249
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "„"
 
-#: gnulib-lib/quotearg.c:250
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "“"
 
-#: gnulib-lib/w32spawn.h:55
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle zlyhal s chybovým kódom 0x%08x"
-
-#: gnulib-lib/w32spawn.h:60
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "zlyhalo _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:101
+#: gnulib-lib/w32spawn.h:81
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nemožno vytvoriť výstupný súbor \"%s\""
@@ -289,7 +283,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -298,7 +292,7 @@ msgstr "formátovacia značka pre parameter %u v '%s' nie je v 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -306,7 +300,7 @@ msgstr "formátovacia značka pre parameter %u nie je v '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -722,11 +716,11 @@ msgid ""
 "1 and 9."
 msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:179
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -739,38 +733,38 @@ msgstr ""
 "Toto je voľne šíriteľný softvér: môžete ho voľne meniť a ďalej šíriť.\n"
 "Neposkytuje sa ŽIADNA ZÁRUKA, v rozsahu povolenom zákonmi.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:185
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:185 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:249
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Skúste `%s --help' a dozviete sa viac informácií.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Použitie: %s [VOĽBA]\n"
@@ -806,29 +800,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteľa\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:291
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:293
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobraziť túto nápovedu a skončiť\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:295
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               zobraziť informáciu o verzii a skončiť\n"
@@ -837,11 +831,11 @@ msgstr "  -V, --version               zobraziť informáciu o verzii a skončiť
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:302
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -854,30 +848,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "Nemôžem získať meno hostiteľa"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "povolený najviac jeden vstupný súbor"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vylučujú"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -886,32 +880,32 @@ msgstr ""
 "Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:272 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Povinné parametre pre dlhé voľby sú povinnými aj pre skrátené voľby.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:275 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupného súboru:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:279 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -919,31 +913,31 @@ msgstr ""
 "  -D, --directory=ADRESÁR     pridať ADRESÁR do zoznamu pre vyhľadávané\n"
 "                              vstupné súbory\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:281 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardný vstup.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie výstupného súboru:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného súboru\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -952,12 +946,12 @@ msgstr ""
 "Výsledky sú zapísané na štandardný výstup ak nie je zadaný výstupný súbor\n"
 "alebo ak je -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Výber správy:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -965,7 +959,7 @@ msgstr ""
 "      --translated            zachovať preložené, odstrániť nepreložené "
 "správy\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -973,54 +967,54 @@ msgstr ""
 "      --untranslated          zachovať nepreložené, odstrániť preložené "
 "správy\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              odstrániť nepresné preklady\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            zachovať nepresné preklady\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           odstrániť zastarané správy označené #~\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zachovať zastarané správy označené #~\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Úprava vlastností:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           nastaviť všetky správy ako nie nepresné\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        nastaviť všetky správy ako nie zastarané\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1029,27 +1023,27 @@ msgstr ""
 "      --clear-previous        odstrániť \"predchádzajúce msgid\" zo všetkých "
 "správ\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=SÚBOR.po    spracovať len položky uvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=SÚBOR.po  spracovať len položky neuvedené v SÚBOR.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 synonymum pre --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1057,24 +1051,24 @@ msgstr ""
 "      --obsolete              synonymum pre --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:284 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax vstupného súboru:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:286
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupný súbor má syntax Java .properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:288
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1083,17 +1077,40 @@ msgstr ""
 "      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti výstupu:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 vždy použiť farby a ostatné vlastnosti textu\n"
+"      --color=KEDY            KEDY použiť farby a ostatné vlastnosti textu.\n"
+"                              KEDY môže byť 'always' (vždy), "
+"'never' (nikdy),\n"
+"                              'auto' (automaticky) alebo 'html'.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr "      --style=SÚBORŠTÝLU      zadať pravidlo štýlu CSS pre --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1101,9 +1118,9 @@ msgstr ""
 "  -e, --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1112,29 +1129,29 @@ msgstr ""
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              zapísať súbor PO, aj keď bude prázdny\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapísať .po súbor s použitím odsadzovania\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1142,8 +1159,8 @@ msgstr ""
 "  -n, --add-location          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1151,32 +1168,32 @@ msgstr ""
 "      --strict                zapísať .po súbor presne dodržiavajúci štýl\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapísať Java súbor .properties\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapísať súbor NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ČÍSLO           nastaviť šírku výstupnej strany\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1185,27 +1202,27 @@ msgstr ""
 "      --no-wrap               nezalamovať riadky správ dlhšie ako šírka\n"
 "                              výstupnej strany do viacerých riadkov\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]...\n"
@@ -1233,24 +1250,24 @@ msgstr ""
 "zabezpečí ich zachovanie iba z prvého PO súboru, ktorý ich definuje.\n"
 "Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=SÚBOR      získať zoznam vstupných súborov zo SÚBORu\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ak je vstupný súbor -, načítaný je štandardný vstup.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1268,7 +1285,7 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 0\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1277,16 +1294,16 @@ msgstr ""
 "  -u, --unique                skratka pre --less-than=2, nastavuje výpis\n"
 "                              len unikátnych správ\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      vstupné súbory májú syntax Java .properties\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1295,12 +1312,12 @@ msgstr ""
 "      --stringtable-input     vstupné súbory majú syntax NeXTstep-GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NÁZOV         kódovanie pre výstup\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1310,47 +1327,28 @@ msgstr ""
 "správu,\n"
 "                              nezlučovať viacero prekladov\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 vždy použiť farby a ostatné vlastnosti textu\n"
-"      --color=KEDY            KEDY použiť farby a ostatné vlastnosti textu.\n"
-"                              KEDY môže byť 'always' (vždy), "
-"'never' (nikdy),\n"
-"                              'auto' (automaticky) alebo 'html'.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=SÚBORŠTÝLU      zadať pravidlo štýlu CSS pre --color\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "neboli zadané vstupné súbory"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebné sú presne 2 vstupné súbory"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Použitie: %s [VOĽBA] def.po ref.pot\n"
@@ -1382,12 +1380,12 @@ msgstr "  def.po                      preklady\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     odkazy na zdrojové súbory\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikátory operácie:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1395,7 +1393,7 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          použije ref.pot na všetky domény v def.po\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1422,17 +1420,17 @@ msgstr "táto správa je nepreložená"
 msgid "this message needs to be reviewed by the translator"
 msgstr "táto správa musí byť skontrolovaná prekladateľom"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "táto správa je použitá, ale nie je definovaná..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ale táto definícia je podobná"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "táto správa je použitá, ale nie je definovaná v %s"
@@ -1450,12 +1448,12 @@ msgstr[0] "nájdených %d závažných chýb"
 msgstr[1] "nájdená %d závažná chyba"
 msgstr[2] "nájdené %d závažné chyby"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musia byť uvedené minimálne dva súbory"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1475,7 +1473,7 @@ msgstr ""
 "komentáre budú zachované iba z prvého PO súboru, v ktorom sú definované.\n"
 "Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1484,42 +1482,42 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           nezapisovať hlavičku s položkou `msgid \"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konvertovať prekladový katalóg do iného kódovania znakov.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cieľ konverzie:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Predvolené kódovanie je kódovanie aktuálneho národného prostredia.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1527,28 +1525,28 @@ msgstr ""
 "      --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presné dodržiavanie štýlu Uniforum\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "nie sú zadané vstupné súbory"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "potrebné je presne jeden vstupný súbor"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Použitie: %s [VOĽBA] VSTUPNÝSÚBOR\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1561,22 +1559,22 @@ msgstr ""
 "programom xgettext). Nepreloženým položkám je priradený preklad\n"
 "zhodný s msgid.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VSTUPNÝSÚBOR                vstupný PO alebo POT súbor\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "chýbajúci názov príkazu"
 
-#: src/msgexec.c:253
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] PRÍKAZ [VOĽBA-PRÍKAZU]\n"
 
-#: src/msgexec.c:258
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1591,7 +1589,7 @@ msgstr ""
 "bude aj výstupom programu msgexec. Návratová hodnota programu msgexec je\n"
 "maximum návratových hodnôt všetkých spustení príkazu.\n"
 
-#: src/msgexec.c:267
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1600,42 +1598,42 @@ msgstr ""
 "Špeciálny vstavaný príkaz s názvom '0' vypisuje preklad nasledovaný nulovým\n"
 "bajtom. Výstup príkazu \"msgexec 0\" je použiteľný ako vstup pre \"xargs -0\".\n"
 
-#: src/msgexec.c:277 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný PO súbor\n"
 
-#: src/msgexec.c:341
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "zápis na štandardný výstup zlyhal"
 
-#: src/msgexec.c:374
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zápis do podprocesu %s zlyhal"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "chýbajúci názov filtra"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "musí byť uvedený aspoň jeden sed skript"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Použitie: %s [VOĽBA] FILTER [VOĽBA-FILTRA]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Aplikovať filter na všetky preklady prekladového katalógu.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1645,18 +1643,18 @@ msgstr ""
 "vstupu\n"
 "a zapisuje upravené preklady na štandardný výstup.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     pridať SKRIPT k vykonávaným príkazom\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1667,14 +1665,14 @@ msgstr ""
 "výkonávaným\n"
 "                                príkazom\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       potlačiť automatickú tlač priestoru vzorov\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1682,12 +1680,12 @@ msgstr ""
 "      --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                výstup s použitím odsadzovania\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1706,22 +1704,22 @@ msgid "invalid endianness: %s"
 msgstr "neplatné poradie bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-d adresár\""
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-l národné prostredie\""
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je platné len s %s alebo %s"
@@ -1772,7 +1770,7 @@ msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Generovať binárny katalóg správ z textového popisu prekladu.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1786,7 +1784,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  menosúboru.po ...           vstupné súbory\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mód činnosti:\n"
@@ -1841,7 +1839,7 @@ msgstr "      --qt                    mód Qt: generovať Qt súbor .qm\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                povoliť presne dodržaný mód Uniforum\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ak je výstupný súbor -, výstup je zapísaný na štandardný výstup.\n"
@@ -1851,13 +1849,13 @@ msgstr "Ak je výstupný súbor -, výstup je zapísaný na štandardný výstup
 msgid "Output file location in Java mode:\n"
 msgstr "Umiestnenie výstupného súboru v móde Java:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZDROJ        názov zdroja\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1890,7 +1888,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1914,7 +1912,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Umiestnenie výstupného súboru v móde Tcl:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d ADRESÁR                  základný adresár katalógov správ .msg\n"
@@ -1927,7 +1925,7 @@ msgid ""
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretácia vstupného súboru:\n"
@@ -2014,7 +2012,7 @@ msgstr ""
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziť štatistiky prekladov\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvýšiť úroveň táravosti\n"
@@ -2070,7 +2068,7 @@ msgstr "nepresná položka `msgstr' bola ignorovaná"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2081,7 +2079,7 @@ msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 msgid "error while reading \"%s\""
 msgstr "chyba pri čítaní súboru \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2090,7 +2088,7 @@ msgstr ""
 "voľba '%c' nemôže byť použitá pred špecifikovaným 'J' alebo 'K' alebo 'T' "
 "alebo 'C' alebo 'X'"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2099,7 +2097,7 @@ msgstr ""
 "Vyberie všetky správy z prekladového katalógu, ktoré vyhovujú zadanému\n"
 "vzoru alebo sú v zadaných zdrojových súboroch.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2176,7 +2174,7 @@ msgstr ""
 "  -v, --invert-match          vytlačiť len tie správy, ktoré nevyhovujú žiadnemu\n"
 "                              výberovému kritériu\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2185,18 +2183,18 @@ msgstr ""
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generovať utriedený výstup\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2207,7 +2205,7 @@ msgstr ""
 "ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestovať\n"
 "vaše preklady.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2218,12 +2216,12 @@ msgstr ""
 "Zadajte, prosím, národné prostredie pomocou voľby --locale alebo\n"
 "výstupný .po súbor pomocou voľby --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Vytvorený %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2232,12 +2230,12 @@ msgstr ""
 "Vytvorí nový PO súbor, inicializuje meta informácie podľa hodnôt z prostredia\n"
 "používateľa.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný POT súbor\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2248,12 +2246,12 @@ msgstr ""
 "adresári.\n"
 "Ak je -, načítaný je štandardný vstup.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného PO súboru\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2263,12 +2261,12 @@ msgstr ""
 "nastavenia národného prostredia používateľa. Ak je -, výstup je zapísaný na\n"
 "štandardný výstup.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          nastaviť cieľové národné prostredie\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2276,7 +2274,7 @@ msgstr ""
 "      --no-translator         označiť, že PO súbor je generovaný "
 "automaticky\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2284,12 +2282,12 @@ msgstr ""
 "Nájdených viac ako jeden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "chyba pri čítaní adresára"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2297,14 +2295,14 @@ msgstr ""
 "V aktuálnom adresári nebol nájdený žiaden .pot súbor.\n"
 "Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
 
-#: src/msginit.c:866 src/msginit.c:941 src/msginit.c:1101 src/msginit.c:1196
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s zlyhal s ukončovacím kódom %d"
 
-#: src/msginit.c:1066
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2321,17 +2319,17 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1482
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktuálna znaková sada \"%s\" nie je prenositeľné meno kódovania"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
@@ -2350,14 +2348,14 @@ msgid ""
 msgstr ""
 "doména \"%s\" vo vstupnom súbore \"%s\" nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2955
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "upozornenie: "
@@ -2594,22 +2592,22 @@ msgid "header field `%s' still has the initial default value\n"
 msgstr ""
 "niektoré položky hlavičky ešte obsahujú počiatočné štandardné hodnoty\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: vstup nie je platný v kódovaní \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: chyba pri konverzii kódovania z \"%s\" na \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor nemá v hlavičke uvedenú znakovú sadu"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:620 src/xgettext.c:640
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2618,7 +2616,7 @@ msgstr ""
 "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
 "nepodporuje takúto konverziu."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2627,8 +2625,8 @@ msgstr ""
 "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa "
 "stanú rovnakými."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:627
-#: src/xgettext.c:647
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2637,16 +2635,16 @@ msgstr ""
 "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia "
 "bola preložená bez iconv()."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je platné len s %s"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "typ zálohy"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2670,18 +2668,18 @@ msgstr ""
 "pri ktorých nemožno nájsť presnú zhodu, bude použitý fuzzy algoritmus,\n"
 "ktorý dosahuje lepšie výsledky.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      preklady podľa starých zdrojových súborov\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     odkazy na nové zdrojové súbory\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2690,7 +2688,7 @@ msgstr ""
 "  -C, --compendium=SÚBOR      prídavná knižnica prekladov správ, môže byť\n"
 "                              zadaná viac ako raz\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2699,27 +2697,27 @@ msgstr ""
 "  -U, --update                aktualizovať def.po,\n"
 "                              nerobiť nič, ak def.po je aktuálny\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Umiestnenie výstupného súboru v móde aktualizácie:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Výsledok je zapísaný späť do def.po.\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        vytvoriť zálohu súboru def.po\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=PRÍPONA        prekryť obvyklú príponu zálohy\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2737,7 +2735,7 @@ msgstr ""
 "  existing, nil   numbered, ak existuje číslovaná záloha, inak simple\n"
 "  simple, never   vždy vytvoriť jednoduchú zálohu\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2747,7 +2745,7 @@ msgstr ""
 "Prípona zálohy je '~', pokiaľ nie je zadaná voľba --suffix alebo nastavená\n"
 "premenná prostredia SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2755,22 +2753,22 @@ msgstr ""
 "      --previous              zachovať predchádzajúce msgid preložených "
 "správ\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       potlačiť indikátory postupu\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "táto správa by mala definovať tvary množného čísla"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "táto správa by nemala definovať tvary množného čísla"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2779,28 +2777,28 @@ msgstr ""
 "%sNačítané %ld starých + %ld odkazov, %ld zlučených, %ld nepresných, %ld "
 "chýbajucich, %ld zrušených.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " hotovo.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s a explicitné mená súborov sa navzájom vylučujú"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [SÚBOR]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Konvertovať binárny katalóg správ na .po súbor v Uniforum štýle.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2808,12 +2806,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  mód Java: vstup je trieda Java ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                režim C#: vstup je .dll súbor .NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2822,24 +2820,24 @@ msgstr ""
 "      --csharp-resources      režim zdrojov C#: vstup je .resources súbor "
 "pre .NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   mód Tcl: vstup je súbor .msg tcl/msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  SÚBOR ...                   vstupné .mo súbory\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Umiestnenie vstupného súboru v móde Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2849,12 +2847,12 @@ msgstr ""
 "Názov triedy je získaný pridaním názvu národného prostredia k názvu zdroja,\n"
 "oddelených znakom \"_\". Trieda je umiestnená pomocou CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Umiestnenie vstupného súboru v režime C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2863,12 +2861,12 @@ msgstr ""
 "Voľby -l a -d sú povinné. Súbor .dll je umiestnený v podadresári zadaného,\n"
 "ktorého názov závisí od národného prostredia adresára.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Umiestnenie vstupného súboru v móde Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2876,20 +2874,20 @@ msgid ""
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je umiestnený v zadanom adresári.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                zapísať pomocou odsadeného výstupného štýlu\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                zapísať súbor s presne dodržaným štýlom "
 "uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2910,12 +2908,12 @@ msgstr ""
 "z prvého prekladu. Pozície v súboroch budú zlúčené. Pri použití voľby\n"
 "--unique budú duplikáty potlačené.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3015,7 +3013,7 @@ msgstr "množné číslo má nesprávny index"
 msgid "too many errors, aborting"
 msgstr "vyskytlo sa príliš veľa chýb, ukončuje sa program"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neplatná viacznaková sekvencia"
@@ -3059,7 +3057,7 @@ msgstr "koniec riadku uprostred reťazca"
 msgid "context separator <EOT> within string"
 msgstr "oddeľovač kontextu <EOT> v reťazci"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
@@ -3243,33 +3241,33 @@ msgstr "nemožno vytvoriť výstupný súbor \"%s\""
 msgid "standard output"
 msgstr "štandardný výstup"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "zlyhalo vytvorenie adresára \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilácia triedy C# zlyhala, prosím skúste --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilácia triedy C# zlyhala"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platným názvom triedy Java: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
@@ -3279,13 +3277,13 @@ msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-po.c:803
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu `\\%c'"
 
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3298,7 +3296,7 @@ msgstr ""
 "ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3377,7 +3375,7 @@ msgstr ""
 "katalóg správ má preklady s množnými číslami,\n"
 "ale formát katalógu správ Tcl nepodporuje množné čísla\n"
 
-#: src/x-awk.c:341 src/x-python.c:1072
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukončený reťazec"
@@ -3397,7 +3395,7 @@ msgstr "%s:%d: upozornenie: neukončená znaková konštanta"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
 
-#: src/x-csharp.c:224 src/xgettext.c:1961
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3454,7 +3452,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1279
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornenie: neplatný znak Unicode"
@@ -3498,32 +3496,32 @@ msgstr "%s:%d: upozornenie: osamotený náhradník U+%04X"
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: nepodarilo sa nájsť ukončenie reťazca \"%s\" pred koncom súboru"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: chýbajúca pravá zátvorka v \\x{ŠESTNÁSTKOVÉČÍSLO}"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\l\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\u\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: neplatná interpolácia premennej na \"%c\""
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\L\") 8-bitového znaku \"%c\""
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\U\") 8-bitového znaku \"%c\""
@@ -3593,7 +3591,7 @@ msgstr ""
 "Prosím, zadajte kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:677
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznáme kódovanie \"%s\". Pokračujem namiesto neho s ASCII."
@@ -3622,28 +3620,28 @@ msgstr ""
 "%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných "
 "dôvodov; použite namiesto toho eval_gettext"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nemožno použiť ak je výstup posielaný na štandardný výstup"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemôže pracovať bez kľúčových slov, ktoré má hľadať"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "upozornenie: súbor `%s' s príponou `%s' je neznámy; skúsim C"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3652,12 +3650,12 @@ msgstr ""
 "  -d, --default-domain=NÁZOV  použiť NÁZOV.po pre výstup (namiesto messages."
 "po)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=SÚBOR          zapísať výstup do zadaného súboru\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3665,12 +3663,12 @@ msgstr ""
 "  -p, --output-dir=ADRESÁR    výstupné súbory budú umiestnené v adresári "
 "ADRESÁR\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Voľba jazyka vstupného súboru:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3689,19 +3687,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Štandardne je jazyk odhadnutý podľa prípony vstupného súboru\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3710,24 +3708,24 @@ msgstr ""
 "      --from-code=NÁZOV       kódovanie vstupných súborov\n"
 "                                (s výnimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Štandardne sa predpokladá, že vstupné súbory sú v kódovaní ASCII.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         spojiť správy s existujúcim súborom\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=SÚBOR.po  položky zo súboru SÚBOR.po nie sú "
 "extrahované\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3741,17 +3739,17 @@ msgstr ""
 "riadky)\n"
 "                              do výstupného súboru\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Špecifické voľby jazyk:\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3764,7 +3762,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3774,7 +3772,7 @@ msgstr ""
 "                              (bez SLOVO znamená: nepoužiť predvolené\n"
 "                              kľúčové slová)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3785,7 +3783,7 @@ msgstr ""
 "číslo\n"
 "                              ARG kľúčového slova SLOVO\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3798,37 +3796,37 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             poznať ANSI C trojznaky na vstupe\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (len jazyk C++)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozoznať formát reťazcov KDE 4\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3837,19 +3835,19 @@ msgstr ""
 "formátovacích\n"
 "                              reťazcov\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapísať Java súbor .properties\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
 "výstupe\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3857,17 +3855,17 @@ msgstr ""
 "      --foreign-user          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=BALÍK    nastaviť názov balíka vo výstupe\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERZIA   nastaviť verziu balíka vo výstupe\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3876,7 +3874,7 @@ msgstr ""
 "chýb\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3886,7 +3884,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako predponu pre\n"
 "                                položky msgstr\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3896,7 +3894,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=REŤAZEC] použiť REŤAZEC alebo \"\" ako príponu pre\n"
 "                                položky msgstr\n"
 
-#: src/xgettext.c:1723
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3904,31 +3902,31 @@ msgid ""
 msgstr ""
 "Parameter pre --flag nemá tvar <kľúčové_slovo>:<č_param>:[pass-]<príznak>: %s"
 
-#: src/xgettext.c:1822
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "štandardný vstup"
 
-#: src/xgettext.c:1926
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1930
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1935
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2040 src/xgettext.c:2073 src/xgettext.c:2135
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: upozornenie: "
 
-#: src/xgettext.c:2043
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3937,7 +3935,7 @@ msgstr ""
 "Aj keď je použité v pozícii formátovacieho reťazca, %s nie je platný "
 "formátovací reťazec %s. Dôvod: %s\n"
 
-#: src/xgettext.c:2044
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3946,7 +3944,7 @@ msgstr ""
 "Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. "
 "Dôvod: %s\n"
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3960,7 +3958,7 @@ msgstr ""
 "Prosím, zvážte použitie formátovacieho reťazca s pomenovanými parametrami\n"
 "a mapovaním namiesto zoznamu parametrov.\n"
 
-#: src/xgettext.c:2137
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3970,29 +3968,29 @@ msgstr ""
 "gettext(\"\") vráti hlavičku s meta informáciami\n"
 "a nie prázdny reťazec.\n"
 
-#: src/xgettext.c:2774
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "nejednoznačne zadaný parameter pre kľúčové slovo '%.*s'"
 
-#: src/xgettext.c:2801
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
 
-#: src/xgettext.c:2826
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "upozornenie: chýbajúci kontext pre parameter množného čísla kľúčového slova "
 "'%.*s'"
 
-#: src/xgettext.c:2847
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "nezhoda kontextu medzi jednotným a množným číslom"
 
-#: src/xgettext.c:2956
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4005,7 +4003,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
 "riadku --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3166
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jazyk `%s' je neznámy"
@@ -4014,6 +4012,12 @@ msgstr "jazyk `%s' je neznámy"
 msgid "<unnamed>"
 msgstr "<nepomenované>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: neprípustná voľba -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle zlyhal s chybovým kódom 0x%08x"
+
 #~ msgid "Not yet implemented."
 #~ msgstr "Ešte nie je implementované."
 

diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index dbe8c9b02bd6620d27af0d78b05f9cbfda30fa01..74dfbe55e6ec2ce0a2e341a07f72bfeebc24d401 100644 (file)
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-10-19 14:00+0200\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -33,22 +34,22 @@ msgstr "dvoumen argument %s za %s"
 msgid "Valid arguments are:"
 msgstr "Veljavni argumenti so:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "začasnega imenika ni mogoče najti, poskusite nastaviti $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ni mogoče ustvariti začasnega imenika z vzorcem \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "začasne datoteke %s ni mogoče odstraniti"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "začasnega imenika %s ni mogoče odstraniti"
@@ -57,44 +58,44 @@ msgstr "začasnega imenika %s ni mogoče odstraniti"
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "datoteke \"%s\" ni moč odpreti za branje"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "varnostnega izvoda \"%s\" ni mogoče odpreti za pisanje"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "napaka pri branju »%s«"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "napaka pri pisanju na »%s«"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "napaka po branju »%s«"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "klic fdopen() neuspešen"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Prevajalnika za C# ni najti; poskusite namestiti pnet"
@@ -104,74 +105,73 @@ msgstr "Prevajalnika za C# ni najti; poskusite namestiti pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtualnega stroja za C# ni najti; poskusite namestit pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s podproces neuspešen"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: izbira »%s« ni enoznačna\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: izbira »%s« zahteva argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznana izbira »--%s«\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznana izbira »%c%s«\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedovoljena izbira -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neveljavna izbira -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: izbira zahteva argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: izbira »-W %s« je dvoumna\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: izbira »%s« zahteva argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,20 +183,20 @@ msgstr "neveljaven argument source_version za compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neveljaven argument target_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje »%s« neuspešno"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko »%s«"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
@@ -207,21 +207,21 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "V/I napaka v podprocesu %s"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -240,70 +240,69 @@ msgstr "cevovoda ni mogoče ustvariti"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "»"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle neuspešen z izhodno kodo 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Klic _open_osfhandle neuspešen"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "izhodne datoteke \"%s\" ni mogoče ustvariti"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "podproces %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s prejel kritični signal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "»%s« za razliko od »msgid« ni veljaven formatni niz %s. Razlog: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "formatno določilo za argument %u, kot v »%s«, v »msgid« ne obstaja"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formatno določilo za argument %u ne obstaja v »%s«"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formatni določili v »msgid« in »%s« za argument %u nista enaki"
 
 #: src/format-boost.c:449
@@ -331,9 +330,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Niz se sklicuje na argument številka %u, vendar ne upošteva argumenta št. %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "števili formatnih določil v »msgid« in »%s« se ne ujemata"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -349,7 +348,8 @@ msgstr "V direktivi številka %u vejici »,« ne sledi število."
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Niz se konča sredi direktive: najden je oklepaj »{« brez zaklepaja »}«."
+msgstr ""
+"Niz se konča sredi direktive: najden je oklepaj »{« brez zaklepaja »}«."
 
 #: src/format-csharp.c:139
 #, c-format
@@ -361,30 +361,32 @@ msgstr ""
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "Direktivo številka %u zaključuje neveljaven znak namesto zaklepaja »}«."
+msgstr ""
+"Direktivo številka %u zaključuje neveljaven znak namesto zaklepaja »}«."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
-msgstr "Niz se začne sredi direktive: najden je zaklepaj »}« brez oklepaja »{«."
+msgstr ""
+"Niz se začne sredi direktive: najden je zaklepaj »}« brez oklepaja »{«."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Niz vsebuje zaklepaj »}« brez para za direktivo številka %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "V direktivi številka %u je kombinacija modifikatorjev neveljavna."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "V direktivi številka %u natančnost pred »%c« ni dovoljena."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -392,31 +394,31 @@ msgid ""
 msgstr ""
 "V direktivi številka %u mora biti številka argumenta za natančnost enaka %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "V direktivi številka %u določitev natančnosti pred »%c« ni dovoljena."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "V direktivi številka %u je določitev natančnosti neveljavna."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "V direktivi številka %u modifikatorji niso dovoljeni pred »%c«."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "»msgid« uporablja %%m, »%s« pa ne"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "»msgid« ne uporablja %%m, »%s« pa uporablja %%m"
 
 #: src/format-invalid.h:22
@@ -513,25 +515,24 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"V direktivi številka %u izbira vsebuje število, ki mu ne sledi »<«, »#« ali »%"
-"s«."
+"V direktivi številka %u izbira vsebuje število, ki mu ne sledi »<«, »#« ali "
+"»%s«."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "v »msgid« ni formatnega določila za argument {%u}, kot v »%s«"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "v »%2$s« ni formatnega določila za argument {%1$u}"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "formatni določili v »msgid« in »%s« za argument {%u} nista enaki"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -541,29 +542,29 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"V direktivi številka %u je parameter %u tipa »%s«, pričakovan pa je parameter "
-"tipa »%s«."
+"V direktivi številka %u je parameter %u tipa »%s«, pričakovan pa je "
+"parameter tipa »%s«."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "V direktivi številka %u je podanih preveč parametrov; pričakovanih je največ "
 "%u parametrov."
 msgstr[1] ""
-"V direktivi številka %u je podanih preveč parametrov; pričakovan je največ %"
-"u parameter."
+"V direktivi številka %u je podanih preveč parametrov; pričakovan je največ "
+"%u parameter."
 msgstr[2] ""
 "V direktivi številka %u je podanih preveč parametrov; pričakovana sta največ "
 "%u parametra."
 msgstr[3] ""
-"V direktivi številka %u je podanih preveč parametrov; pričakovani so največ %"
-"u parametri."
+"V direktivi številka %u je podanih preveč parametrov; pričakovani so največ "
+"%u parametri."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
@@ -608,13 +609,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "Niz se sklicuje na nek argument na nezdružljive načine."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "formatni določili v »msgid« in »%s« nista enakovredni"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formatna določila v »%s« niso podmnožica tistih v »msgid«"
 
 #: src/format-perl.c:433
@@ -626,12 +627,12 @@ msgstr ""
 "V direktivi številka %u je določilo velikosti nezdružljivo s pretvornim "
 "faktorjem »%c«."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "v »%2$s« ni formatnega določila za argument »%1$s«"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -639,47 +640,44 @@ msgstr ""
 "Niz se sklicuje na argumente tako prek njihovih imen kot prek nepoimenovanih "
 "določil argumentov."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Niz se sklicuje na argument »%s« na nezdružljive načine."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "formatno določilo v »msgid« zahteva preslikavo, tisto v »%s« pa pričakuje n-"
 "terček"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "formatno določilo v »msgid« zahteva n-terček, tisto v »%s« pa pričakuje "
 "preslikavo"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "v »msgid« ni formatnega določila za argument »%s«, kot v »%s«"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formatni določili v »msgid« in »%s« za argument »%s« nista enaki"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "»msgid« je enostaven formatni niz, »%s« pa ne: vsebuje zastavico »L« ali "
 "dvoštevilčno število argumenta"
@@ -725,11 +723,11 @@ msgid ""
 "1 and 9."
 msgstr "Znak, ki zaključuje direktivo številka %u, ni števka med 1 in 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -742,38 +740,38 @@ msgstr ""
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor(ica) %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA]\n"
@@ -809,29 +807,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ta navodila\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               različica programa\n"
@@ -840,11 +838,11 @@ msgstr "  -V, --version               različica programa\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 
@@ -853,30 +851,30 @@ msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "gostiteljskega imena ni moč ugotoviti"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dovoljena je največ ena vhodna datoteka"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izključujeta"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -885,10 +883,10 @@ msgstr ""
 "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 "in rokovanje z njimi.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -896,23 +894,23 @@ msgstr ""
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Izbira vhodne datoteke:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -920,31 +918,31 @@ msgstr ""
 "  -D, --directory=IMENIK      vhodne datoteke iščemo tudi v navedenem "
 "IMENIKU\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -954,12 +952,12 @@ msgstr ""
 "standardni\n"
 "izhod.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Izbira sporočil:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -967,7 +965,7 @@ msgstr ""
 "      --translated            obdržimo prevedena sporočila, zavržemo "
 "neprevedena\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -975,57 +973,57 @@ msgstr ""
 "      --untranslated          obdržimo neprevedena sporočila, zavržemo "
 "prevedena\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              brez ohlapnih samodejno prevedenih sporočil\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            zgolj ohlapna samodejno prevedena sporočila\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Rokovanje z določili:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             vsa sporočila označimo kot ohlapno pprevedena\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           izbrišemo vse oznake o ohlapnosti prevodov\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        izbrišemo vse oznake o zastarelosti prevodov\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1034,14 +1032,14 @@ msgstr ""
 "      --clear-previous        izbrišemo oznake \"previous msgid\" iz vseh "
 "sporočil\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=DATOTEKA.po  obdelamo le vnose, navedene v DATOTEKI.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1049,28 +1047,28 @@ msgstr ""
 "      --ignore-file=DATOTEKA.po  obdelamo vnose razen navedenih v DATOTEKI."
 "po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Skladnja vhodne datoteke:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1078,8 +1076,8 @@ msgstr ""
 "  -P, --properties-input      skladnja vhodne datoteke je javanska ."
 "properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1088,17 +1086,42 @@ msgstr ""
 "      --stringtable-input     skladnja vhodne datoteke je NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 vedno uporabimo barve in druge besedilne "
+"atribute\n"
+"      --color=POGOJ           barve in druge besedilne atribute uporabimo "
+"pri\n"
+"                              POGOJU; POGOJ je lahko »always«, »never«, "
+"»auto«\n"
+"                              ali »html«\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr "      --style=DATOTEKA-CSS    določi slogovna pravila CSS za --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1106,9 +1129,9 @@ msgstr ""
 "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
 "(privzeto)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1116,27 +1139,28 @@ msgstr ""
 "  -E, --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 "                             razširjenega nabora znakov\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location        brez vrstic »#: datoteka:vrstica« v izpisu\n"
+msgstr ""
+"      --no-location        brez vrstic »#: datoteka:vrstica« v izpisu\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1144,8 +1168,8 @@ msgstr ""
 "  -n, --add-location       z vrsticami »#: datoteka:vrstica« v izpisu "
 "(privzeto)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1153,32 +1177,32 @@ msgstr ""
 "      --strict             izpis v strogi obliki Uniforum, brez razširitev "
 "GNU\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapiši NeXTstep/GNUstep datoteko .strings\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ŠTEVILO      širina strani pri izpisu, v znakih\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1186,32 +1210,32 @@ msgid ""
 msgstr ""
 "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "določeni kriteriji izbire niso mogoči (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1233,26 +1257,26 @@ msgstr ""
 "zahtevamo, da se ohranijo samo iz prve datoteke PO, ki jih definira. Mesta\n"
 "v datotekah iz vseh datotek PO se ohranijo.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 "  VHODNA_DATOTEKA ...            vhodna datoteka (ali več vhodnih datotek)\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz "
 "DATOTEKE\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1262,7 +1286,7 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je neskončno)\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1272,7 +1296,7 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1281,8 +1305,8 @@ msgstr ""
 "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
 "                                 enolično definirana sporočila\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1290,8 +1314,8 @@ msgstr ""
 "  -P, --properties-input      skladnja vhodnih datotek je javanska ."
 "properties\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1300,12 +1324,12 @@ msgstr ""
 "      --stringtable-input     skladnja vhodnih datotek je NeXTstep/GNUstep \n"
 "                              .strings\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1314,47 +1338,33 @@ msgstr ""
 "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 "                             naletimo; ne združujemo več prevodov\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
-"      --color                 vedno uporabimo barve in druge besedilne "
-"atribute\n"
-"      --color=POGOJ           barve in druge besedilne atribute uporabimo "
-"pri\n"
-"                              POGOJU; POGOJ je lahko »always«, »never«, »auto«\n"
-"                              ali »html«\n"
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=DATOTEKA-CSS    določi slogovna pravila CSS za --color\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "vhodni datoteki nista podani"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebni sta natančno dve vhodni datoteki"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1371,22 +1381,22 @@ msgstr ""
 "v programu.  Kadar ne najdemo natančnega ujemanja msgid, zaradi boljše\n"
 "diagnostike poskusimo z ohlapnim (fuzzy) algoritmom.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikatorji delovanja:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1394,48 +1404,53 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ref.po uporabimo na vseh domenah iz def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     ne uporabljamo ohlapnega ujemanja\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 "      --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      obdržimo neprevedena sporočila\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "to sporočilo ni prevedeno"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "to sporočilo mora pregledati prevajalec"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "to sporočilo je uporabljeno, a ne definirano..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...a ta definicija je podobna"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporočilo ni uporabljeno"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1444,12 +1459,12 @@ msgstr[1] "%d kritična napaka"
 msgstr[2] "%d kritični napaki"
 msgstr[3] "%d kritične napake"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "podani morata biti vsaj dve datoteki"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1468,7 +1483,7 @@ msgstr ""
 "pri izvlačenju se ohranijo samo iz prve podane datoteke PO. Mesta v datotekah \n"
 "se ohranijo iz vseh datotek PO.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1478,41 +1493,41 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           brez glave z vnosom »msgid \"\"«\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Pretvarjanje kataloga sporočil v drug kodni nabor.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cilj pretvorbe:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                izpis datoteke PO z zamiki\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           brez vrstic »#: datoteka:vrstica« v izpisu\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1520,30 +1535,30 @@ msgstr ""
 "      --add-location          z vrsticami »#: datoteka:vrstica« v izpisu "
 "(privzeto)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez "
 "razširitev\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "zahtevana je natančno ena vhodna datoteka"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1556,22 +1571,22 @@ msgstr ""
 "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
 "msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "manjka ime ukaza"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] UKAZ [IZBIRA-UKAZA]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1585,7 +1600,7 @@ msgstr ""
 "prevod posebej. Izhod programa postane izhod programa msgexec. Izhodna\n"
 "koda programa msgexec je največja od izhodnih kod pri klicu ukaza.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1594,42 +1609,42 @@ msgstr ""
 "Poseben vgrajen ukaz »0« izpiše prevod in izpis zaključi z znakom s kodo nič.\n"
 "Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "izpis na standardni izhod neuspešen"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "posredovanje podatkov podprocesu %s neuspešno"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "manjka ime filtra"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "podan mora biti vsaj en skript v sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1638,18 +1653,18 @@ msgstr ""
 "FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n"
 "vhoda in izpiše spremnjen prevod na standardni izhod.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SKRIPT     dodaj SKRIPT med ukaze, ki se izvedejo\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1659,14 +1674,14 @@ msgstr ""
 "  -f, --file=SKRIPTNA_DATOTEKA  dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
 "                                ki se izvedejo\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1674,80 +1689,62 @@ msgstr ""
 "      --no-escape          brez ubežnih sekvenc v skladnji jezika C "
 "(privzeto)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header        ohrani glavo nespremenjeno, ne filtriraj je\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Funkcija še ni izvedena."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "s podprocesom %s ni mogoče vzpostaviti nebločne V/I povezave"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "povezava s podprocesom %s neuspešna"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "branje izhoda podprocesa %s neuspešno"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "podproces %s zaključil z izhodno kodo %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument %s mora biti eno samo ločilo"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "neveljaven vrstni red bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s zahteva določitev \"-d directory\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s zahteva določitev \"-l locale\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je veljavno edino z %s ali %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je veljavno edino z %s, %s ali %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1756,7 +1753,7 @@ msgstr[1] "%d prevedeno sporočilo"
 msgstr[2] "%d prevedeni sporočili"
 msgstr[3] "%d prevedena sporočila"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1765,7 +1762,7 @@ msgstr[1] ", %d ohlapni prevod"
 msgstr[2] ", %d ohlapna prevoda"
 msgstr[3] ", %d ohlapni prevodi"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1774,17 +1771,17 @@ msgstr[1] ", %d neprevedeno sporočilo"
 msgstr[2] ", %d neprevedeni sporočili"
 msgstr[3] ", %d neprevedena sporočila"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporočil.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1793,17 +1790,17 @@ msgstr ""
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko. Enako za neobvezne argumente.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Način delovanja:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1812,7 +1809,7 @@ msgstr ""
 "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1821,12 +1818,12 @@ msgstr ""
 "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
 "več)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                način C#: ustvarimo .NET-datoteko .dll\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1834,43 +1831,43 @@ msgid ""
 msgstr ""
 "      --csharp-resources      način C#: ustvarimo .NET-datoteko z viri\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    način Qt: ustvarimo datoteko .qm za Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez razširitev "
 "GNU\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=SREDSTVO     ime sredstva\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1878,13 +1875,13 @@ msgid ""
 msgstr ""
 "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1898,12 +1895,12 @@ msgstr ""
 "podani\n"
 "imenik.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Položaj izhodne datoteke v načinu C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1912,7 +1909,7 @@ msgstr ""
 "  -d IMENIK                   korenski imenik za krajevno odvisne datoteke ."
 "dll\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1921,17 +1918,17 @@ msgstr ""
 "Izbiri -l in -d sta obvezni. Datoteka .dll se zapiše v podimenik podanega\n"
 "imenika; ime podimenika ustreza oznaki izbrane krajevne prilagoditve.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1939,12 +1936,12 @@ msgid ""
 msgstr ""
 "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1955,20 +1952,20 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          preverimo od jezika odvisne formatne nize\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          preverimo obstoj in vsebino glave\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1977,7 +1974,7 @@ msgstr ""
 "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
 "                                domene in izbiro --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1986,7 +1983,7 @@ msgstr ""
 "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1996,13 +1993,13 @@ msgstr ""
 "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 "                                menujske izbire\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2010,7 +2007,7 @@ msgstr ""
 "  -a, --alignment=ŠTEVILO     poravnava nizov na dano ŠTEVILO bajtov "
 "(privzeto %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2018,85 +2015,86 @@ msgstr ""
 "      --no-hash               binarni katalog sporočil bo brez razpršene "
 "tabele\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            s statistiko glede prevodov\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               z dodatnimi sporočili med izvajanjem\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "opozorilo: starejše izdaje msgfmt bodo pri tem javile napako\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktiva »domain %s« ni bila upoštevana"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "prazno polje »msgstr« zavrženo"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "ohlapni vnos za polje »msgstr« zavržen"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
-msgstr "izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
+msgstr ""
+"izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2105,7 +2103,7 @@ msgstr ""
 "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
 "pripadajo dani izvorni datoteki.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2186,7 +2184,7 @@ msgstr ""
 "  -v, --invert-match          izpiši le sporočila, ki ne ustrezajo nobenemu\n"
 "                              od podanih kriterijev\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2194,18 +2192,18 @@ msgstr ""
 "      --escape             z ubežnimi sekvencami v skladnji C, brez \n"
 "                             razširjenega nabora znakov\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2215,7 +2213,7 @@ msgstr ""
 "spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n"
 "Brez tega ne morete preizkusiti vaših prevodov.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2226,12 +2224,12 @@ msgstr ""
 "Prosim, izberite jezikovno okolje z izbiro --locale, ali pa\n"
 "določite izhodno datoteko PO z izbiro --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Ustvarjena datoteka %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2240,12 +2238,12 @@ msgstr ""
 "Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n"
 "uporabnikovega jezikovnega okolja.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka POT\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2256,12 +2254,12 @@ msgstr ""
 "imeniku.\n"
 "Če je enaka -, se bere standardni vhod.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2271,12 +2269,12 @@ msgstr ""
 "nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna datoteka \n"
 "podan -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=JJ_DD          določitev ciljnega jezikovnega okolja\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2284,7 +2282,7 @@ msgstr ""
 "      --no-translator         privzamemo, da je datoteka PO samodejno "
 "ustvarjena\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2292,12 +2290,12 @@ msgstr ""
 "Našli smo več kot eno datoteko .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "napaka pri branju trenutnega imenika"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2305,14 +2303,14 @@ msgstr ""
 "V trenutnem imeniku ni najti nobene datoteke .pot.\n"
 "Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "podproces %s neuspešen z izhodno kodo %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2327,28 +2325,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Slovenski prevodi paketa %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "trenutno izbrani nabor \"%s\" ni prenosljivo ime kodnega nabora"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "v vhodni datoteki sta dva različna nabora znakov, \"%s\" in \"%s\""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "vhodna datoteka »%s« ne vsebuje glave z določitvijo nabora znakov"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2357,19 +2355,19 @@ msgstr ""
 "domena \"%s\" v vhodni datoteki »%s« ne vsebuje glave z določitvijo nabora "
 "znakov"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2379,7 +2377,7 @@ msgstr ""
 "UTF8.\n"
 "Izhod je pretvorjen v UTF8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2387,12 +2385,12 @@ msgid ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med %s in %"
-"s.\n"
+"Vhodne datoteke vsebujejo sporočila v različnih kodnih naborih, med %s in "
+"%s.\n"
 "Izhod je pretvorjen v UTF8.\n"
 "Drugačen kodni nabor lahko določite z izbiro --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2407,7 +2405,7 @@ msgstr ""
 "so kodirani skladno z UTF-8 od samega začetka, torej v datotekah z izvorno "
 "kodo.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2420,12 +2418,12 @@ msgstr ""
 "Izhod »%s« bo morda napačen.\n"
 "Predlagane rešitve za to težavo so:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Nastavite LC_ALL na jezikovno okolje s kodnim naborom %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2436,7 +2434,7 @@ msgstr ""
 "  zatem uporabite »%s«,\n"
 "  in ga končno z ukazom »msgconv« pretvorite nazaj v %s.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2449,7 +2447,7 @@ msgstr ""
 "  zatem uporabite »%s«,\n"
 "  in ga končno z ukazom »msgconv« pretvorite nazaj v %s.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2460,25 +2458,25 @@ msgstr ""
 "Izhod »%s« bo morda napačen.\n"
 "Mogoča rešitev za to težavo je, da nastavite LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, izraz za izbiro množinske oblike pa lahko da vrednosti do %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "izraz za izbiro množinske oblike lahko povzroči deljenje z nič"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "izraz za izbiro množinske oblike lahko povzroči prekoračitev obsega"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2486,32 +2484,32 @@ msgstr ""
 "izraz za izbiro množinske oblike lahko povzroči aritmetične napake, morda\n"
 "deljenje z nič"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Poskusite uporabiti naslednje, veljavno za %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog sporočil vsebuje množinske oblike prevodov,"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "v glavi pa manjka določilo \"plural=IZRAZ\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "v glavi pa manjka določilo \"nplurals=ŠTEVILO\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "neveljavna vrednost nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "neveljaven izraz za množinske oblike"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
@@ -2521,7 +2519,7 @@ msgstr "nplurals = %lu"
 # msgstr[1] "...nekatera sporočila pa imajo samo %lu množinsko obliko"
 # msgstr[2] "...nekatera sporočila pa imajo samo %lu množinski obliki"
 # msgstr[3] "...nekatera sporočila pa imajo samo %lu množinske oblike"
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2535,7 +2533,7 @@ msgstr[3] "nekatera sporočila pa imajo samo %lu množinske oblike"
 # msgstr[1] "...nekatera sporočila pa imajo %lu množinsko obliko"
 # msgstr[2] "...nekatera sporočila pa imajo %lu množinski obliki"
 # msgstr[3] "...nekatera sporočila pa imajo %lu množinske oblike"
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2544,7 +2542,7 @@ msgstr[1] "nekatera sporočila pa imajo %lu množinsko obliko"
 msgstr[2] "nekatera sporočila pa imajo %lu množinski obliki"
 msgstr[3] "nekatera sporočila pa imajo %lu množinske oblike"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2552,81 +2550,81 @@ msgstr ""
 "katalog sporočil vsebuje množinske oblike, manjka pa glava z določili\n"
 "\"Plural-Forms: nplurals=ŠTEVILO; plural=IZRAZ;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "polji ,msgid` in ,msgid_plural` se ne začneta obe z ,\\n`"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "polji »msgid« in »msgstr[%u]« se ne začneta obe z »\\n«"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "polji »msgid« in »msgstr« se ne začneta obe z »\\n«"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgid_plural« se ne končata obe z »\\n«"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgstr[%u]« se ne končata obe z »\\n«"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgstr« se ne končata obe z »\\n«"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bližnjice »%c«"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveč oznak bližnjic »%c«"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "v glavi manjka polje »%s«\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "polje »%s« v glavi se mora začeti na začetku vrstice\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "polje »%s« ima še vedno začetno privzeto vrednost\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: vhod ni veljaven v kodnem naboru »%s«"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: napaka pri pretvorbi iz nabora znakov \"%s\" v nabor \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "v vhodni datoteki manjka glava z določilom kodnega nabora"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2635,7 +2633,7 @@ msgstr ""
 "Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), ta pa ne podpira te "
 "pretvorbe."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2644,26 +2642,26 @@ msgstr ""
 "Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri različni ključi "
 "msgid postanejo enaki."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), vendar ta izvod programa "
-"ni preveden za uporabo iconv()."
+"Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), vendar ta izvod "
+"programa ni preveden za uporabo iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je veljavno edino z %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "vrsta varnostne kopije"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2686,17 +2684,17 @@ msgstr ""
 "pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. Kjer\n"
 "natančnega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2706,7 +2704,7 @@ msgstr ""
 "navedemo\n"
 "                                lahko več kot eno\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2715,29 +2713,29 @@ msgstr ""
 "  -U, --update                posodobi def.po,\n"
 "                                če je def.po že posodobljen, ne stori nič\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 "      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2756,7 +2754,7 @@ msgstr ""
 "                  sicer enostavne\n"
 "  simple, never   vedno enostavne varnostne kopije\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2766,12 +2764,7 @@ msgstr ""
 "Varnostna kopija ima pripono »~«, razen če ni z izbiro --suffix ali\n"
 "spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugače. \n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     ne uporabljamo ohlapnega ujemanja\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2779,22 +2772,22 @@ msgstr ""
 "      --previous              obdržimo prejšnja polja msgid prevedenih "
 "sporočil\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       brez kazalnika poteka\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pri tem sporočilu bi morale biti določene množinske oblike"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2803,27 +2796,29 @@ msgstr ""
 "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, "
 "manjkajočih %ld, opuščenih %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " opravljeno.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s in izrecna imena datotek se med seboj izključujejo"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Pretvorba kataloga sporočil iz binarne oblike .mo v obliko Uniforum .po.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2832,12 +2827,12 @@ msgstr ""
 "  -j, --java                  javanski način: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                način C#: vhod je .NET-datoteka .dll\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2846,24 +2841,24 @@ msgstr ""
 "      --csharp-resources      način virov C#: vhod je .NET-datoteka ."
 "resources\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   način tcl: vhod je datoteka tcl/msgcat .msg\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DATOTEKA ...                datoteka MO (ali več datotek MO)\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2874,12 +2869,12 @@ msgstr ""
 "podčrtajem,\n"
 "pridá ime jezikovnega okolja. Razred je določen s spremenljivko CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Mesto izhodne datoteke v načinu C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2888,12 +2883,12 @@ msgstr ""
 "Izbiri -l in -d sta obvezni. Datoteka .dll se nahaja v podimeniku podanega\n"
 "imenika; ime podimenika ustreza oznaki izbrane krajevne prilagoditve.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2901,18 +2896,18 @@ msgid ""
 msgstr ""
 "Izbiri -l in -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict             izpis v strogi obliki Uniforum, brez razširitev\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2933,12 +2928,12 @@ msgstr ""
 "ohranijo le komentarji prvega prevoda. Ohranijo se vsi podatki o mestu\n"
 "sporočila v izvorni datoteki. Z izbiro --unique se podvojena sporočila zavržejo.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 izpišemo le podvojena sporočila\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2947,7 +2942,7 @@ msgstr ""
 "  -u, --unique                   vsako sporočilo izpišemo le enkrat,\n"
 "                                   dvojnike zavržemo\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<st. vhod>"
@@ -3033,65 +3028,65 @@ msgstr "prva množinska oblika ima indeks različen od nič"
 msgid "plural form has wrong index"
 msgstr "množinska oblika ima napačen indeks"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "preveč napak, nadaljevanje ni možno"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neveljavno večzložno zaporedje"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "nepopolno večzložno zaporedje na koncu datoteke"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "nepopolno večzložno zaporedje na koncu vrstice"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv neuspešen"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "ključna beseda \"%s\" neprepoznana"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "neveljavno krmilno zaporedje"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "znak za konec datoteke sredi niza"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "znak za konec vrstice sredi niza"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "podvojena definicija sporočila"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "to je kraj prve definicije"
 
@@ -3176,17 +3171,17 @@ msgstr "vhod ni veljaven v naboru znakov »%s«"
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "napaka pri pretvorbi iz nabora znakov \"%s\" v nabor \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "pričakujemo dva argumenta"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Uporaba: %s [IZBIRA] URL DATOTEKA\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3195,11 +3190,26 @@ msgstr ""
 "Prinese in izpiše vsebino podanega URL. Če URL ni dosegljiv, se uporabni\n"
 "krajevno dostopna DATOTEKA.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "napaka pri pisanju na standardni izhod"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3242,43 +3252,43 @@ msgstr ""
 "katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne "
 "podpira"
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "izhodne datoteke \"%s\" ni mogoče ustvariti"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standardni izhod"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "ustvarjanje imenika »%s« neuspešno"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "prevajanje razreda C# neuspešno"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ni veljavno javansko ime razreda: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite "
 "$JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3288,14 +3298,14 @@ msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence »\\%c«"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3309,7 +3319,7 @@ msgstr ""
 "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3334,8 +3344,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3359,7 +3369,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "napaka pri pisanju v podproces %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3367,7 +3377,7 @@ msgstr ""
 "katalog sporočil vsebuje od konteksta odvisne prevode\n"
 " vendar zapis virov C# ne podpira kontekstov\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3391,36 +3401,34 @@ msgstr ""
 "katalog sporočil vsebuje množinske oblike, vendar katalog sporočil TCL\n"
 "ne podpira množinskih oblik\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: opozorilo: nezaključen regularni izraz"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Ne-ASCII niz na %s%s.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3429,7 +3437,7 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3438,7 +3446,7 @@ msgstr ""
 "%s:%d: Nepopolno dolgo večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3447,7 +3455,7 @@ msgstr ""
 "%s:%d: Nezaključeno večbajtno zaporedje na koncu datoteke.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3456,12 +3464,12 @@ msgstr ""
 "%s:%d: Nezaključeno večbajtno zaporedje na koncu vrstice.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: napaka v iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3470,34 +3478,34 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: opozorilo: nezaključen konstanten nit"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 "%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zaklepaj »}«"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3506,50 +3514,49 @@ msgstr ""
 "Programski jezik \"glade\" ni podprt. %s se naslanja na expat().\n"
 "Ta izdaja je bila prevedena brez expat().\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: opozorilo: osamljen surogat U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: zaključka niza \"%s\" ni najti pred koncem datoteke"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: manjkajoči zaviti zaklepaj v \\x{ŠESTNAJSTIŠKO}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\l\") osembitnega znaka \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\u\") osembitnega znaka \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: neveljavna interpolacija spremenljivke pri »%c«"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\L\") osembitnega znaka \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\U\") osembitnega znaka \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3558,7 +3565,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3570,7 +3577,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3582,7 +3589,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3594,7 +3601,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3606,7 +3613,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3618,27 +3625,27 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznani nabor znakov »%s«. Nadaljujemo z ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neveljavna definicija niza"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: za # manjka številka"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: niz ni veljaven izraz"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3647,27 +3654,28 @@ msgstr ""
 "%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, "
 "uporabite raje eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne deluje brez ključnih besed, ki naj jih išče"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
-msgstr "opozorilo: vrsta datoteka »%s« s pripono »%s« ni prepoznana; poskušamo C"
+msgstr ""
+"opozorilo: vrsta datoteka »%s« s pripono »%s« ni prepoznana; poskušamo C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3675,25 +3683,25 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni IMENIK\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3714,19 +3722,19 @@ msgstr ""
 "NXStringTable,\n"
 "                                   RST, glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      okrajšava za --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3735,44 +3743,47 @@ msgstr ""
 "      --from-code=NABOR          nabor znakov vhodnih datotek\n"
 "                                   (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Privzeti nabor znakov vhodnih datotek je ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            združi sporočila z obstoječo datoteko\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DATOTEKA.po  vnosov iz navedene DATOTEKE ne izvlečemo\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ZNAČKA]    v vhodno datoteko dodamo komentar z "
 "navedeno\n"
 "                                  ZNAČKO\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifične za jezik:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              iz datotek potegnemo vse nize\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3786,18 +3797,18 @@ msgstr ""
 "java,\n"
 "                                C#, awk, TCL, perl, PHP, GCC-vir, glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=BESEDA]         iskanje po dodatnih ključih besedah "
 "(prazen\n"
 "                                   niz BESEDA pomeni brez uporabe privzetih\n"
 "                                   ključnih besed)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3807,7 +3818,7 @@ msgstr ""
 "      --flag=BESEDA:ARG:STIKALO  dodatno stikalo za nize znotraj argumenta\n"
 "                                 številka ARG ključne besede BESEDA\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3821,37 +3832,37 @@ msgstr ""
 "java,\n"
 "                                C#, awk, YCP, TCL, perl, PHP, GCC-vir)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             razumi trigrafe ANSI C na vhodu\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (samo jeziki C, C++ in predmetni C)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (samo jezik C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   prepoznaj oblikovne nize KDE 4\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3859,19 +3870,19 @@ msgstr ""
 "      --debug                    bolj razčlenjen rezultat razpoznave\n"
 "                                   oblikovnega niza\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=NIZ     v izhodu nastavimo nosilca avtorskih pravic "
 "na NIZ\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3879,18 +3890,18 @@ msgstr ""
 "      --foreign-user          brez copyrighta FSF v izpisu za tuje "
 "uporabnike\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    nastavi ime PAKETA na izhodu\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=NIZ      v izhodu nastavimo različico paketa na NIZ\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3898,38 +3909,55 @@ msgstr ""
 "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporočila o napakah "
 "msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr "  -m, --msgstr-prefix[=NIZ]     NIZ ali \"\" kot predpona za msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr "  -M, --msgstr-suffix[=NIZ]     NIZ ali \"\" kot pripona za msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Argument --flag nima skladnje <ključna-beseda>:<št-arg>:[pass-]<stikalo>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: opozorilo: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3938,16 +3966,16 @@ msgstr ""
 "Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz "
 "%s. Razlog: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
-"Čeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: %"
-"s\n"
+"Čeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: "
+"%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3960,7 +3988,7 @@ msgstr ""
 "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
 "ter preslikave namesto n-terčka argumentov.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3970,28 +3998,28 @@ msgstr ""
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "dvoumno določen argument za ključno besede »%.*s«"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "opozorilo: manjkajoči kontekst za množinski argument ključne besede »%.*s«"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4003,7 +4031,7 @@ msgstr ""
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "jezik »%s« ni poznan"
@@ -4012,6 +4040,30 @@ msgstr "jezik »%s« ni poznan"
 msgid "<unnamed>"
 msgstr "<nepoimenovano>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nedovoljena izbira -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle neuspešen z izhodno kodo 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Funkcija še ni izvedena."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "s podprocesom %s ni mogoče vzpostaviti nebločne V/I povezave"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "povezava s podprocesom %s neuspešna"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "branje izhoda podprocesa %s neuspešno"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "podproces %s zaključil z izhodno kodo %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "polje »%s« ima še vedno začetno privzeto vrednost\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Večterni sklici na %%%c."
 
@@ -5026,8 +5078,8 @@ msgstr "<nepoimenovano>"
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
-#~ "d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "

diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index c3056a04f19324fd1f80eabfe0a08092ca22a178..65f694c0cfdd9f98e2efee91923459e33ed86af2 100644 (file)
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2004-02-16 16:00+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,22 +32,22 @@ msgstr "неједнозначан аргумент „%s“ за  %s"
 msgid "Valid arguments are:"
 msgstr "Исправни аргументи су:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "не могу да нађем привремени директоријум, поставите $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "не могу да направим излазну датотеку „%s“"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
@@ -55,44 +56,44 @@ msgstr "не могу да направим привремени директо
 msgid "write error"
 msgstr "грешка уписа"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "не могу да отворим резервну датотеку „%s“ ради уписа"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "грешка при упису „%s“"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "грешка након читања „%s“"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "неуспешан fdopen()"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, fuzzy, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -106,74 +107,73 @@ msgstr ""
 "Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
 "поставите $JAVA"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Непозната системска грешка"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s: неуспешан подпроцес"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: опција „%s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: опција „%s“ захтева аргумент\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: непозната опција „--%s“\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: непозната опција „%c%s“\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: неисправна опција %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неисправна опција -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: опција захтева аргумент -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: опција „-W %s“ није једнозначна\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: опција „%s“ захтева аргумент\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -185,20 +185,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не могу да направим „%s“"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "грешка при писању датотеке „%s“"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -212,20 +212,20 @@ msgstr ""
 "Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
 "поставите $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "У/И грешка подпроцеса %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија исцрпљена"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -244,71 +244,70 @@ msgstr "не могу да направим цевку"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "Неуспешан DuplicateHandle са грешком 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "неуспешан _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "не могу да направим излазну датотеку „%s“"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "подпроцес од %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "подпроцес од %s је примио кобни сигнал %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "„%s“ није исправна ниска формата %s, за разлику од „msgid“. Разлог: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "спецификација формата за %u. аргумент, као у „%s“, не постоји у „msgid“"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "спецификација формата за %u. аргумент не постоји у „%s“"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "спецификације формата у „msgid“ и „%s“ за %u. аргумент нису исте"
 
 #: src/format-boost.c:449
@@ -335,9 +334,9 @@ msgstr "У %u. директиви, члан након „<“ није праћ
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "Ниска позива %u. аргумент, али занемарује %u. аргумент."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не поклапа се број спецификација формата у „msgid“ и „%s“"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -377,48 +376,48 @@ msgstr "Ниска почиње усред директиве: нађох „}
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Ниска се завршава усред директиве."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "У %u. директиви, %d. аргумент је негативан."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "У %u. директиви, %d. аргумент је негативан."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -499,8 +498,8 @@ msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"У %u. директиви, број аргумента није праћен запетом и неким од „%s“, „%s“, „%"
-"s“, „%s“."
+"У %u. директиви, број аргумента није праћен запетом и неким од „%s“, „%s“, "
+"„%s“, „%s“."
 
 #: src/format-java.c:572
 #, c-format
@@ -515,22 +514,21 @@ msgid ""
 msgstr "У %u. директиви, избор садржи број који није праћен „<“, „#“ или „%s“."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "спецификација формата за аргумент {%u}, као у „%s“, не постоји у „msgid“"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "спецификација формата за аргумент {%u} не постоји у „%s“"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "нису једнаке спецификације формата у „msgid“ и „%s“ за аргумент {%u}"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -540,17 +538,17 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"У %u. директиви, %u. параметар је типа „%s“ а очекиван је параметар типа „%"
-"s“."
+"У %u. директиви, %u. параметар је типа „%s“ а очекиван је параметар типа "
+"„%s“."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "У %u. директиви, дато је превише параметара; очекивах највише %u параметар."
 msgstr[1] ""
@@ -602,13 +600,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "Ниска се позива на неке аргументе на несагласан начин."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "спецификације формата у „msgid“ и „%s“ нису еквивалентне"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "спецификакције формата у „%s“ не представљају подскуп оних из „msgid“"
 
 #: src/format-perl.c:433
@@ -619,12 +617,12 @@ msgid ""
 msgstr ""
 "У %u. директиви, ознака величине је несагласна са ознаком претварања „%c“."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спецификација формата за аргумент „%s“ не постоји у „%s“"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -632,48 +630,45 @@ msgstr ""
 "Ниска позива аргументе и кроз имена аргумената и кроз неименоване наводе "
 "аргумената."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Ниска позива аргумент са именом „%s“ на несагласне начине."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "спецификација формата у „msgid“ очекује мапирање, а они у „%s“ очекују н-"
 "торку"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "спецификација формата у „msgid“ очекује н-торку, а они у „%s“ очекују "
 "мапирање"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "спецификација формата за аргумент „%s“, као у „%s“, не постоји у „msgid“"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "нису исте спецификације формата у „msgid“ и „%s“ за аргумент „%s“"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -714,11 +709,11 @@ msgid ""
 "1 and 9."
 msgstr "Знак који завршава %u. директиву није цифра између 1 и 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -727,38 +722,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Написа %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА]\n"
@@ -793,29 +788,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адресе за име рачунара\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  прикажи ову помоћ и заврши\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               испиши податке о издању и заврши\n"
@@ -824,11 +819,11 @@ msgstr "  -V, --version               испиши податке о издањ
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
 
@@ -837,30 +832,30 @@ msgstr "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "не могу да сазнам име домаћина"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "дозвољена највише једна улазна датотека"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s су међусобно искључиви"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -869,32 +864,32 @@ msgstr ""
 "Филтрира поруке каталога превода према њиховим особинама, и барата\n"
 "тим особинама.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Обавезни аргументи дугих опција су обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Путања до улазне датотеке:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO датотека\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -902,31 +897,31 @@ msgstr ""
 "  -D, --directory=ДИР         додај ДИР у списак за тражење улазних "
 "датотека\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Уколико није дата улазна датотека или је „-“, чита се стандардни улаз.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Путања излазне датотеке:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену датотеку\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -936,85 +931,85 @@ msgstr ""
 "или\n"
 "ако је она „-“.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор поруке:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              уклони поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            задржи поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           уклони застареле поруке #~\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         задржи застареле поруке #~\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Баратање особинама:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             означи све поруке као „нејасне“\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          означи све поруке као застареле\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        означи све поруке као не-застареле\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ДАТОТЕКА.po  баратај једино пољима уписаним у ДАТОТЕКА.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1022,28 +1017,28 @@ msgstr ""
 "      --ignore-file=ДАТОТЕКА.po  баратај једино пољима која нису у ДАТОТЕКА."
 "po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 исто што и --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              исто што и --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтакса улазне датотеке:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1051,8 +1046,8 @@ msgstr ""
 "  -P, --properties-input      улазна датотека је у синтакси Јава ."
 "properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1062,17 +1057,35 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Детаљи излаза:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1080,9 +1093,9 @@ msgstr ""
 "  -e, --no-escape             не користи C истицање у излазу "
 "(подразумевано)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1090,28 +1103,28 @@ msgstr ""
 "  -E, --escape                користи C истицање у излазу, без проширених \n"
 "                              знакова\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              испиши ПО датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                испиши ПО датотеку користећи стил увлачења\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           не исписуј редове „#: датотека:ред“\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1119,8 +1132,8 @@ msgstr ""
 "  -n, --add-location          образуј редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1128,32 +1141,32 @@ msgstr ""
 "      --strict                испиши ПО датотеку строго сагласну са "
 "Унифорумом\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    испиши NeXTstep/GNUstep .strings датотеку\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=БРОЈ            постави ширину излазне странице\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1163,31 +1176,31 @@ msgstr ""
 "ширине \n"
 "                              излазне странице, у више редова\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           образуј поређани излаз\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          поређај излаз по положају у датотеци\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "дат је немогућ критеријум избора (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1209,24 +1222,24 @@ msgstr ""
 "осим ако се користи --use-first, када се узимају из прве ПО датотеке \n"
 "која их дефинише. Положаји у датотекама из свих ПО датотека се гомилају.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА ...         улазне датотеке\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=ДАТОТЕКА   преузми списак улазних датотека из ДАТОТЕКА\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Уколико је улазна датотека „-“, чита се стандардни улаз.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1235,7 +1248,7 @@ msgstr ""
 "  -<, --less-than=БРОЈ        испиши поруке са мање од оволико дефиниција,\n"
 "                              уобичајено је бесконачно ако није постављено\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1244,7 +1257,7 @@ msgstr ""
 "  -<, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
 "                              уобичајено је 0 ако није постављено\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1253,8 +1266,8 @@ msgstr ""
 "  -u, --unique                скраћено за --less-than=2, захтева да\n"
 "                              се испишу једино јединствене поруке\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1262,8 +1275,8 @@ msgstr ""
 "  -P, --properties-input      улазне датотеке користе синтаксу за Јава ."
 "properties\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1273,12 +1286,12 @@ msgstr ""
 "GNUstep \n"
 "                              .strings датотеке\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодирање за излаз\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1287,41 +1300,33 @@ msgstr ""
 "      --use-first             користи први доступни превод за сваку поруку,\n"
 "                              не спајај више превода\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "нису дате улазне датотеке"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "неопходне су тачно две улазне датотеке"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Употреба: %s [ОПЦИЈА] подр.po реф.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1338,22 +1343,22 @@ msgstr ""
 "превели баш сваку поруку вашег програма.  Када не може да нађе тачно \n"
 "поклапање, користи се нејасно поклапање ради боље дијагностике.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  подр.po                     преводи\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  реф.pot                     референце на изворне поруке\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Измењивачи рада:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1361,48 +1366,53 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          примени реф.pot на сваки домен у подр.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     не користи нејасно поклапање\n"
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ова порука се користи али није дефинисана..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...али ова дефиниција је слична"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ова порука се користи али није дефинисана у %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1410,12 +1420,12 @@ msgstr[0] "нађох %d кобну грешку"
 msgstr[1] "нађох %d кобне грешке"
 msgstr[2] "нађох %d кобних грешака"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "обавезно је навести бар две датотеке"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1434,7 +1444,7 @@ msgstr ""
 "извучене примедбе ће се очувати, али само из прве ПО датотеке која их \n"
 "дефинише.  Положаји у датотекама из свих ПО датотека ће се гомилати.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1443,41 +1453,41 @@ msgstr ""
 "  ->, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
 "                              уобичајено је 1 ако није постављено\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           изостави заглавље са пољем „msgid \"\"“\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Претвара каталог превода у друго кодирање знакова.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Одредиште претварања:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Подразумевано кодирање је кодирање текућег локалитета.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                стил излаза са увлачењем\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           избаци редове „#: датотека:ред“\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1485,28 +1495,28 @@ msgstr ""
 "      --add-location          сачувај редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строги Унифорум стил исписа\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "није наведена улазна датотека"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "неопходна је тачно једна улазна датотека"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Употреба: %s [ОПЦИЈА] УЛАЗНА-ДАТОТЕКА\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1519,22 +1529,22 @@ msgstr ""
 "направљена помоћу xgettext-а). Непреведена поља добијају превод \n"
 "идентичан са msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА             улазна PO или POT датотека\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "недостаје име наредбе"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] НАРЕДБА [ОПЦИЈА-НАРЕДБЕ]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1548,7 +1558,7 @@ msgstr ""
 "једном за сваки превод.  Његов излаз постаје улаз msgexec-а.  Повратни\n"
 "код msgexec-а је највећи повратни код кроз све позиве програма.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1557,42 +1567,42 @@ msgstr ""
 "Нарочита уграђена наредба звана „0“ исписује превод, праћен нула-бајтом.\n"
 "Излаз „msgexec 0“ је погодан као улаз за „xargs -0“.\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПО датотека\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "неуспешан упис на стандардни излаз"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "неуспешан упис у подпроцес %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "недостаје име филтера"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "обавезно је навести бар један sed спис"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Употреба: %s [ОПЦИЈА] ФИЛТЕР [ОПЦИЈЕ-ФИЛТЕРА]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Примењује филтер на све преводе из каталога превода.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1601,18 +1611,18 @@ msgstr ""
 "ФИЛТЕР може бити било који програм који чита превод са стандардног улаза\n"
 "и уписује измењени превод на стандардни излаз.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисне ОПЦИЈЕ-ФИЛТЕРа када је ФИЛТЕР „sed“:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СПИС       додај СПИС међу наредбе за извршавање\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1622,14 +1632,14 @@ msgstr ""
 "  -f, --file=ДАТОТЕКА-СПИСА   додај садржај ДАТОТЕКА-СПИСА међу наредбе\n"
 "                              које се извршавају\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       избаци аутоматски испис простора шаблона\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1637,80 +1647,62 @@ msgstr ""
 "      --no-escape             не користи C истицање у излазу "
 "(подразумевано)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                стил излаза са увлачењем\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           не мењај поље са заглављем, не филтрирај га\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Још увек није направљено."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "не могу да поставим неблокирајући У/И за подпроцес %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "неуспешно споразумевање са подпроцесом %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "неуспешно читање из подпроцеса %s"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "подпроцес %s је прекинут уз повратни код %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент за %s треба да буде један интерпункцијски знак"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "за %s је обавезно навести „-d директоријум“"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "за %s је обавезно навести „-l локалитет“"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s је једино исправно уз %s или %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s је једино исправно уз %s, %s или %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1718,7 +1710,7 @@ msgstr[0] "%d преведена порука"
 msgstr[1] "%d преведене поруке"
 msgstr[2] "%d преведених порука"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1726,7 +1718,7 @@ msgstr[0] ", %d нејасна порука"
 msgstr[1] ", %d нејасне поруке"
 msgstr[2] ", %d нејасних порука"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1734,17 +1726,17 @@ msgstr[0] ", %d непреведена порука"
 msgstr[1] ", %d непреведене поруке"
 msgstr[2] ", %d непреведених порука"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Образуј бинарни каталог порука из текстуалног описа превода.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1753,17 +1745,17 @@ msgstr ""
 "Обавезни аргументи за дуге опције су обавезни и за кратке опције.\n"
 "Слично за необавезне аргументе.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим рада:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1771,7 +1763,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Јава режим: образуј Јава класу ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1780,12 +1772,12 @@ msgstr ""
 "      --java2                 налик --java, и претпостави Јава2 (JDK 1.2 или "
 "новији)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# режим: образуј .NET .dll датотеку\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1794,40 +1786,40 @@ msgstr ""
 "      --csharp-resources      Режим са C# ресурсима: образује .NET ."
 "resources датотеку\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: образуј tcl/msgcat .msg датотеку\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt режим: образуј Qt .qm датотеку\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                омогући строг Унифорум режим\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Уколико је излазна датотека „-“, испис се врши на стандардни излаз.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Путања излазне датотеке у Јава режиму:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име ресурса\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1835,7 +1827,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=ЛОКАЛИТЕТ      име локалитета, или језик или језик_ДРЖАВА\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -1843,7 +1835,7 @@ msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за хијерархију \n"
 "                              директоријума класе\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1855,12 +1847,12 @@ msgstr ""
 "раздвојено подвлаком.  Опција -d је обавезна.  Класа се уписује под\n"
 "наведеним директоријумом.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Путања излазне датотеке у C# режиму:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1868,7 +1860,7 @@ msgid ""
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум за .dll за локалитет\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1877,18 +1869,18 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се уписује у поддиректоријум \n"
 "датог директоријума чије име зависи од локалитета.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Путања излазне датотеке у Tcl режиму:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             основни директоријум .msg каталога порука\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1896,12 +1888,12 @@ msgid ""
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Обрада улазне датотеке:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1912,20 +1904,20 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          провери ниске формата у зависности од језика\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          провери присуство и садржај заглавља\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1934,7 +1926,7 @@ msgstr ""
 "      --check-domain          провери сударе међу директивама домена и\n"
 "                                опције --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1943,7 +1935,7 @@ msgstr ""
 "  -C, --check-compatibility   провери да ли се ГНУ msgfmt понаша као \n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1954,97 +1946,97 @@ msgstr ""
 "у \n"
 "                                ставкама менија\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             користи нејасне преводе у излазу\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=БРОЈ        поравнај ниске на БРОЈ бајтова (обично: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               бинарна датотека неће садржати хеш табелу\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            испиши статистичке податке о преводима\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               опширнији испис\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "упозорење: недостаје или је неисправно заглавље PO датотеке\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "упозорење: претварање скупа знакова неће радити\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "упозорење: заглавље PO датотеке је нејасно\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "упозорење: старија издања msgfmt-а ће овде наићи на грешку\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "име домена „%s“ није прикладно за име датотеке"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "име домена „%s“ није прикладно за име датотеке: користићу префикс"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "занемарена директива „domain %s“"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "занемарен унос са празним „msgstr“"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "занемарен нејасан „msgstr“ унос"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: упозорење: изворна датотека садржи нејасне преводе"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2052,7 +2044,7 @@ msgid ""
 msgstr ""
 "опција „%c“ се не може користити пре него што се наведе „K“, „Т“ или „C“"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2061,7 +2053,7 @@ msgstr ""
 "Извлачи све поруке из каталога превода које одговарају датом шаблону\n"
 "или припадају одређеним изворним датотекама.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2128,7 +2120,7 @@ msgstr ""
 "  -f, --file=ДАТОТЕКА         преузми ШАБЛОН из ДАТОТЕКА\n"
 "  -i, --ignore-case           занемари разлике величине слова\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2136,18 +2128,18 @@ msgstr ""
 "      --escape                користи C истицање у излазу, без проширених \n"
 "                              знакова\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           образуј поређан излаз\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file          поређај излаз према положају у датотеци\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2157,7 +2149,7 @@ msgstr ""
 "окружења LANG, како је описано у датотеци ABOUT-NLS. Ово је\n"
 "неопходно ради испробавања ваших превода.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2168,12 +2160,12 @@ msgstr ""
 "Наведите локалитет помоћу опције --locale или \n"
 "излазну ПО датотеку помоћу опције --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Направих %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2182,12 +2174,12 @@ msgstr ""
 "Образујем нову ПО датотеку, постављајући мета податке помоћу вредности из \n"
 "окружења корисника.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=УЛАЗНА-ДАТОТЕКА  улазна ПОТ датотека\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2197,12 +2189,12 @@ msgstr ""
 "Уколико није дата улазна датотека, тражићу ПОТ датотеку у текућем \n"
 "директоријуму. Уколико је „-“, читам стандардни улаз.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ДАТОТЕКА  испиши излаз у наведену ПО датотеку\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2212,19 +2204,19 @@ msgstr ""
 "подешавања корисниковог локалитета. Ако је „-“, резултат исписујем на\n"
 "стандардни излаз.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=ЈЈ_ДД          постави одредишни локалитет\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         претпостави да је ПО датотека самоизграђена\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2232,12 +2224,12 @@ msgstr ""
 "Нађох више од једне .pot датотеке.\n"
 "Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "грешка при читању текућег директоријума"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2245,14 +2237,14 @@ msgstr ""
 "Не нађох .pot датотеку у текућем директоријуму.\n"
 "Наведите улазну .pot датотеку помоћу опције --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "неуспешан подпроцес %s са повратним кодом %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2268,28 +2260,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "енглески преводи за пакет %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "присутни скуп знакова „%s“ не чини име преносивог кодирања"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "два различита скупа знакова „%s“ и „%s“ у улазној датотеци"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека „%s“ не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2298,19 +2290,19 @@ msgstr ""
 "домен „%s“ у улазној датотеци „%s“ не садржи поље заглавља са ознаком скупа "
 "знакова"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "одредишни скуп знакова „%s“ није преносиво име за кодирање."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2319,7 +2311,7 @@ msgstr ""
 "Улазне датотеке садрже поруке у разним кодирањима, између осталих и УТФ-8.\n"
 "Претварам излаз у УТФ-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2327,12 +2319,12 @@ msgid ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих у %s и %"
-"s.\n"
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих у %s и "
+"%s.\n"
 "Претварам излаз у УТФ-8.\n"
 "Да изаберете другачије кодирање излаза, користите опцију --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2341,7 +2333,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2354,12 +2346,12 @@ msgstr ""
 "Излаз „%s“-а може бити нетачан.\n"
 "Могућа решења су:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Поставите LC_ALL на локалитет са кодирањем %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2370,7 +2362,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  а онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2383,7 +2375,7 @@ msgstr ""
 "  затим примените „%s“,\n"
 "  и онда претворите назад у %s помоћу „msgconv“.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2394,64 +2386,64 @@ msgstr ""
 "Излаз из „%s“-а може бити нетачан.\n"
 "Могуће решење је да поставите LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "израз за множине може дати негативне вредности"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu али израз за множине може дати чак и вредности %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "израз за множине може проузроковати дељење нулом"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "израз за множине може проузроковати прекорачење опсега целих бројева"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Покушајте да користите следеће, исправно за %s:\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталог порука садржи преводе облика за множину..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...али у заглављу недостаје поље „plural=ИЗРАЗ“"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...али у заглављу недостаје поље „nplurals=БРОЈ“"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "недозвољена вредност за nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "недозвољен израз за plural"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2459,7 +2451,7 @@ msgstr[0] "али неке поруке имају само један обли
 msgstr[1] "али неке поруке имају само %lu облика за множину"
 msgstr[2] "али неке поруке имају само %lu облика за множину"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2467,7 +2459,7 @@ msgstr[0] "али неке поруке имају један облик за м
 msgstr[1] "али неке поруке имају %lu облика за множину"
 msgstr[2] "али неке поруке имају %lu облика за множину"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2475,81 +2467,81 @@ msgstr ""
 "каталог порука садржи преводе облика множине, али нема поља заглавља „Plural-"
 "Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "не почиње и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgid_plural“ са „\\n“"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgstr[%u]“ са „\\n“"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "не завршава се и „msgid“ и „msgstr“ са „\\n“"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "баратање множинама је Гнуово проширење gettext-а"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "У msgstr недостаје ознака пречице са тастатуре „%c“"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "У msgstr има превише ознака пречица са тастатуре „%c“"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "недостаје поље „%s“ у заглављу\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "поље „%s“ у заглављу треба да почне на почетку реда\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "поÑ\99а â\80\9e%sâ\80\9c и даÑ\99е Ñ\81адÑ\80жи поÑ\87еÑ\82нÑ\83 подÑ\80азÑ\83меванÑ\83 вÑ\80едноÑ\81Ñ\82\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "нека поÑ\99а заглавÑ\99а и даÑ\99е Ñ\81адÑ\80же поÑ\87еÑ\82не подÑ\80азÑ\83меване вÑ\80едноÑ\81Ñ\82и\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не садржи поље заглавља са ознаком скупа знакова"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2558,7 +2550,7 @@ msgstr ""
 "Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(), а iconv() не "
 "подржава ово претварање."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2567,8 +2559,8 @@ msgstr ""
 "Претварање из „%s“ у „%s“ уводи понављања: неки различити msgid-ови постају "
 "једнаки."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2577,16 +2569,16 @@ msgstr ""
 "Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(). Ово издање је "
 "изграђено без iconv()-а."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s је једино исправно уз %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "врста резерве"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2609,18 +2601,18 @@ msgstr ""
 "положаји у датотекама. Када нема тачног поклапања, користи се нејасно \n"
 "поклапање ради добијања бољих резултата.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  подр.po                     преводи који одговарају старом изворном коду\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  реф.pot                     позива нове изворне поруке\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2629,7 +2621,7 @@ msgstr ""
 "  -C, --compendium=ДАТОТЕКА   додатна библиотека превода порука, може се\n"
 "                              навести више него једном\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2638,27 +2630,27 @@ msgstr ""
 "  -U, --update                освежи подр.po,\n"
 "                              не ради ништа ако је већ усклађен подр.po\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Путања излазне датотеке у режиму освежавања:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Резултат се уписује назад у подр.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=УПРАВЉАЊЕ      сачини резерву за подр.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=СУФИКС         измени уобичајени суфикс за резерве\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2676,7 +2668,7 @@ msgstr ""
 "  existing, nil   побројане ако већ постоје побројане резерве, иначе обичне\n"
 "  simple, never   увек прави обичне резерве\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2687,34 +2679,29 @@ msgstr ""
 "променљиве \n"
 "окружења SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     не користи нејасно поклапање\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       искључи обавештавање о напретку\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ова порука треба да дефинише облике множине"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "ова порука не треба да дефинише облике множине"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2723,26 +2710,28 @@ msgstr ""
 "%sПрочитах %ld старих + %ld референтних, спојих %ld, нејасних %ld, недостаје "
 "%ld, превазиђених %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " готово.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s и изричито име датотеке су међу собом искључиви"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [ДАТОТЕКА]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Претвори бинарни каталог порука у .po датотеку Унифорум стила.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2750,12 +2739,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  Јава режим: улаз је Јава класа ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# режим: улаз је .NET .dll датотека\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2764,24 +2753,24 @@ msgstr ""
 "      --csharp-resources      Режим за C# ресурсе: улаз је .NET .resources "
 "датотека\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: улаз је tcl/msgcat .msg датотека\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ДАТОТЕКА ...                улазне .mo датотеке\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Путања улазне датотеке у Јава режиму:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2791,12 +2780,12 @@ msgstr ""
 "Име класе се одређујем надодавањем имена локалитета на име ресурса, \n"
 "раздвојено подвлаком. Класа се проналази помоћу CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Путања улазне датотеке у C# режиму:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2805,12 +2794,12 @@ msgstr ""
 "Опције -l и -d су обавезне.  Датотека .dll се налази у поддиректоријуму \n"
 "датог директоријума чије име зависи од локалитета.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Путања улазне датотеке у Tcl режиму:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2818,17 +2807,17 @@ msgid ""
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се налази у датом директоријуму.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                стил исписа са увлачењем\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                испис у строгом стилу унифорума\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2849,12 +2838,12 @@ msgstr ""
 "Положаји у датотеци ће се такође гомилати. Када се користи опција --unique,\n"
 "поновљени преводи се занемарују.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              испиши само поновљене\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2863,7 +2852,7 @@ msgstr ""
 "  -u, --unique                испиши само јединствене поруке, занемари "
 "поновљене\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<стдул>"
@@ -2949,65 +2938,65 @@ msgstr "први облик множине користи не-нула инде
 msgid "plural form has wrong index"
 msgstr "облик множине има погрешан индекс"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "превише грешака, одустајем"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неисправан вишебајтни низ"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "недовршен вишебајтни низ на крају датотеке"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "недовршен вишебајтни низ на крају реда"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "неуспех iconv-а"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "непозната кључна реч „%s“"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "неисправан контролни низ"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "крај датотеке унутар ниске"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "крај реда унутар ниске"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ова датотека не сме садржати директиве за домен"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "двострука дефиниција поруке"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...ово је положај прве дефиниције"
@@ -3099,17 +3088,17 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "очекивах два аргумента"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Употреба: %s [ОПЦИЈА] АДРЕСА ДАТОТЕКА\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3118,11 +3107,26 @@ msgstr ""
 "Преузимам и исписујем садржај адресе. Уколико не могу да приступим адреси,\n"
 "користи се локално доступна ДАТОТЕКА уместо ње.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "грешка при писању на стандардни излаз"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 #, fuzzy
 msgid ""
@@ -3168,44 +3172,44 @@ msgstr ""
 "каталог порука садржи преводе са облицима множине, али излазни облик их не "
 "подржава."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не могу да направим излазну датотеку „%s“"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "стандардни излаз"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не могу да направим „%s“"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, fuzzy, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 "неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 "неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "није исправно име Јава класе: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3216,13 +3220,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка при отварању датотеке „%s“ ради уписа"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове истицања"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3235,7 +3239,7 @@ msgstr ""
 "другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3259,8 +3263,8 @@ msgstr ""
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3283,7 +3287,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "грешка при писању датотеке „%s“"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3292,7 +3296,7 @@ msgstr ""
 "каталог порука садржи преводе облика множине\n"
 "али облик Qt каталога порука не подржава баратање множинама\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 #, fuzzy
 msgid ""
 "message catalog has plural form translations\n"
@@ -3319,36 +3323,34 @@ msgstr ""
 "али облик Tcl каталога порука не подржава баратање множинама\n"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: упозорење: неокончан регуларни израз"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: упозорење: неокончана знаковна константа"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: упозорење: неокончана дословна ниска"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3357,7 +3359,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3366,7 +3368,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3375,7 +3377,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3384,12 +3386,12 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "неуспех iconv-а"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3398,33 +3400,33 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: упозорење: неисправан Уникод знак"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: упозорење: неокончана константна ниска"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: упозорење: нађох „)“ где очекивах „}“"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: упозорење: нађох „}“ где очекивах „)“"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3434,58 +3436,57 @@ msgstr ""
 "Ово издање је изграђено без expat-а.\n"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: не могу да нађем окончање ниске „%s“ било где пре краја датотеке"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: недостаје десна заграда у \\x{ХЕКСАДЕКАДНИ-БРОЈ}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\l“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\u“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неисправно вредновање променљивих на „%c“"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\L“) 8-битног знака „%c“"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3495,7 +3496,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3505,7 +3506,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3515,7 +3516,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3525,7 +3526,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3535,27 +3536,27 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неисправна дефиниција ниске"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: недостаје број након #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неисправна ниска са изразом"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3564,29 +3565,29 @@ msgstr ""
 "%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
 "уместо тога користите eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing се не може користити када се излаз исписује на стандардни "
 "излаз"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "упозорење: екстензија „%2$s“ датотеке „%1$s“ је непозната; пробаћу C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извуци преводиве ниске из датих улазних датотека.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3594,12 +3595,12 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=ИМЕ    користи ИМЕ.po за излаз (уместо messages.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ДАТОТЕКА       испиши излаз у наведену датотеку\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3607,12 +3608,12 @@ msgstr ""
 "  -p, --output-dir=ДИР        излазне датотеке се смештају у директоријум "
 "ДИР\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3631,19 +3632,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-извор, NXStringTable, RST, Глејд)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   пречица за --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Подразумева се погађање језика на основу проширења имена датотеке.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3652,43 +3653,46 @@ msgstr ""
 "      --from-code=ИМЕ         кодирање улазних датотека\n"
 "                                (осим за Питон, Tcl, Глејд)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         споји поруке са постојећом датотеком\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=ДАТОТЕКА.po поља из ДАТОТЕКА.po се не извлаче\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ОЗНАКА] постави блок примедбу помоћу ОЗНАКА (или оне \n"
 "                              које претходе редовима кључне речи) у "
 "излазној \n"
 "                              датотеци\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Посебне опције за језик:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извуци све ниске\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3700,18 +3704,18 @@ msgstr ""
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, Tcl, Перл, PHP, GCC-извор, Глејд)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=РЕЧ]         додатне кључне речи које да тражим "
 "(изостављање\n"
 "                              РЕЧ означава употребу подразумеваних кључних \n"
 "                              речи)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3722,7 +3726,7 @@ msgstr ""
 "бројем \n"
 "                              АРГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3734,55 +3738,55 @@ msgstr ""
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, YCP, Tcl, Перл, PHP, GCC-извор)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             разумевање АНСИ C триграфа за улаз\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (једино језици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (једино језик C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 детаљнији резултат препознавања ниске формата\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3790,18 +3794,18 @@ msgstr ""
 "      --foreign-user          избаци FSF ауторска права у излазу за стране \n"
 "                              кориснике\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3809,41 +3813,58 @@ msgstr ""
 "      --msgid-bugs-address=АДРЕСА@Е-ПОШТЕ  постави адресу за пријављивање \n"
 "                                           грешака у msgid-има\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс msgstr поља\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс msgstr поља\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "A --flag аргумент не користи синтаксу <кључна-реч>:<брарг>:[пролаз-]"
 "<ознака>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандардни улаз"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: упозорење: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3852,16 +3873,16 @@ msgstr ""
 "Иако се користи на месту ниске формата, %s не представља исправну ниску "
 "формата %s. Разлог: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Иако је објављена као таква, %s не представља исправну ниску формата %s. "
 "Разлог: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3870,7 +3891,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3880,27 +3901,27 @@ msgstr ""
 "gettext(\"\") враћа поље заглавља са мета-подацима, а не \n"
 "празну ниску.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3912,7 +3933,7 @@ msgstr ""
 "променљиву MSGID_BUGS_ADDRESS; иначе, наведите опцију\n"
 "--msgid-bugs-address у наредби.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "језик „%s“ није познат"
@@ -3921,6 +3942,30 @@ msgstr "језик „%s“ није познат"
 msgid "<unnamed>"
 msgstr ""
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неисправна опција %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "Неуспешан DuplicateHandle са грешком 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Још увек није направљено."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "не могу да поставим неблокирајући У/И за подпроцес %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "неуспешно споразумевање са подпроцесом %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "неуспешно читање из подпроцеса %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "подпроцес %s је прекинут уз повратни код %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поља „%s“ и даље садржи почетну подразумевану вредност\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Вишеструко позивање %%%c."
 

diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index 99639e74d2ec7985fa6536c5e0cbec57df8d7f24..3a49328100ece2bc518e99272f48d1f9c8ec8ade 100644 (file)
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-01-13 16:59+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2008-02-13 17:03+0100\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -32,22 +32,22 @@ msgstr "tvetydigt argument %s för %s"
 msgid "Valid arguments are:"
 msgstr "Giltiga argument är:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan inte hitta en temporärkatalog, försök sätta $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan inte skapa temporärkatalog med mall \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan inte ta bort temporärfil %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan inte ta bort temporärkatalog %s"
@@ -56,44 +56,44 @@ msgstr "kan inte ta bort temporärkatalog %s"
 msgid "write error"
 msgstr "skrivfel"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fel uppstod när \"%s\" öppnades för läsning"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "kan inte öppna säkerhetskopiefil \"%s\" för skrivning"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "fel vid skrivning till \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fel efter \"%s\" lästes"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() misslyckades"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Kompilator för C# hittades inte, försök installera pnet"
@@ -103,74 +103,73 @@ msgstr "Kompilator för C# hittades inte, försök installera pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Virtuell maskin för C# hittades inte, försök installera pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-barnprocess misslyckades"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: flaggan \"%s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tar inget argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, 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:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flaggan kräver ett argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -182,20 +181,20 @@ msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ogiltigt värde på argumentet target_version till compile_java_clas"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fel vid skrivning till filen \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC"
@@ -206,20 +205,20 @@ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
 "Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fel i %s-barnprocess"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:510 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -238,74 +237,73 @@ msgstr "kan inte skapa rör"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "\""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "\""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle misslyckades med felkod 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle misslyckades"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan inte skapa utfilen \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s-barnprocess"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s-barnprocess fick ödesdiger signal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "\"%s\" är inte en giltig formatsträng i %s, till skillnad från \"msgid\".\n"
 "Orsak: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv för argument \"%u\", som i \"%s\", finns inte i \"msgid"
 "\""
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument %u finns inte i \"%s\""
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "formateringsdirektivet i \"msgid\" och \"%s\" för argument %u är inte "
 "likadana"
@@ -336,9 +334,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Strängen refererar till argument nummer %u men ignorerar argument nummer %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antalet formateringsdirektiv i \"msgid\" och \"%s\" är olika"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -362,8 +360,8 @@ msgstr ""
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
-"Direktiv nummer %u avslutas med det ogiltiga tecknet \"%c\" istället för \"}"
-"\"."
+"Direktiv nummer %u avslutas med det ogiltiga tecknet \"%c\" istället för "
+"\"}\"."
 
 #: src/format-csharp.c:140
 #, c-format
@@ -383,24 +381,24 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Strängen innehåller ett ensamt \"}\" efter direktiv nummer %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "I direktiv nummer %u: flaggkombinationen är inte tillåten."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "I direktiv nummer %u: en precision är inte tillåten före \"%c\"."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "I direktiv nummer %u: argumentnumret för precisionen måste vara %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -409,24 +407,24 @@ msgstr ""
 "I direktiv nummer %u: en precisionsspecifikation är inte tillåten före \"%c"
 "\"."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "I direktiv nummer %u: precisionsspecifikationen är ogiltig."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "I direktiv nummer %u: flaggor är inte tillåtna före \"%c\"."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "\"msgid\" använder %%m men '%s' gör inte det"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "\"msgid\" använder inte %%m men '%s' använder %%m"
 
 #: src/format-invalid.h:22
@@ -527,22 +525,21 @@ msgstr ""
 "\"#\" eller \"%s\"."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv för argument {%u}, som i \"%s\", finns inte i \"msgid\""
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument {%u} finns inte i \"%s\""
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "formateringsdirektiv i \"msgid\" och \"%s\" för argument {%u} är inte "
 "likadana"
@@ -616,13 +613,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "Strängen refererar till några argument på inkompatibla sätt."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "formateringsdirektiv i \"msgid\" och \"%s\" är inte ekvivalenta"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateringsdirektiv i \"%s\" är inte en delmängd av de i \"msgid\""
 
 #: src/format-perl.c:433
@@ -634,12 +631,12 @@ msgstr ""
 "I direktiv nummer %u är storleksbestämningen inkompatibel med konverteringen "
 "\"%c\"."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument \"%s\" finns inte i \"%s\""
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -647,49 +644,46 @@ msgstr ""
 "Strängen refererar till argument både via argumentnamn och via namnlösa "
 "argumentspecifikationer."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Strängen refererar till argumentet \"%s\" på inkompatibla sätt."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "formateringsdirektiv i \"msgid\" tar en avbildning, de i \"%s\" tar en tupel"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "formateringsdirektiv i \"msgid\" tar en tupel, de i \"%s\" tar en avbildning"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv för argument \"%s\", som i \"%s\", finns inte i \"msgid"
 "\""
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "formateringsdirektiv i \"msgid\" och \"%s\" för argument \"%s\" är inte "
 "likadana"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "\"msgid\" är en enkel formatsträng, men \"%s\" är inte det; den innehåller "
 "en \"L\"-flagga eller ett tvåsiffrigt argumenttal"
@@ -733,11 +727,11 @@ msgid ""
 msgstr ""
 "Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:331 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -750,38 +744,38 @@ msgstr ""
 "Detta program är fri programvara.  Du kan modifiera och distribuera den.\n"
 "Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:337 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:458 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Användning: %s [FLAGGA]\n"
@@ -816,29 +810,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser för värdnamnet\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:577 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:579 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:581 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               visa versionsinformation och avsluta\n"
@@ -847,11 +841,11 @@ msgstr "  -V, --version               visa versionsinformation och avsluta\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:592 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
@@ -863,30 +857,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "kunde inte hämta värdnamn"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "högst en infil tillåten"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:362 src/msgmerge.c:383
-#: src/msgmerge.c:387 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s och %s är ömsesidigt uteslutande"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -895,62 +889,62 @@ msgstr ""
 "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n"
 "manipulerar attributen.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:479 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:482
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Plats för infiler:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-infil\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:488 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=KATALOG     sök infiler även i KATALOG\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Om ingen infil är given eller om den är - läses standard in.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:500 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Plats för utfil:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:502 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FIL       skriv resultat till angiven fil\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:504
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -958,12 +952,12 @@ msgid ""
 msgstr ""
 "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelandeval:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -971,7 +965,7 @@ msgstr ""
 "      --translated            behåll översatta, ta bort oöversatta "
 "meddelanden\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -979,59 +973,59 @@ msgstr ""
 "      --untranslated          behåll oöversatta, ta bort översatta "
 "meddelanden\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ta bort meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            behåll meddelanden markerade som \"fuzzy\"\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ta bort föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         behåll föråldrade #~ meddelanden\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attributmanipulation:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             markera alla meddelanden som \"fuzzy\"\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           ta bort \"fuzzy\"-markering från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          markera alla meddelanden som föråldrade\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ta bort föråldradmarkering från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1040,49 +1034,49 @@ msgstr ""
 "      --clear-previous        ta bort \"previous msgid\" från alla "
 "meddelanden\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FIL.po      bearbeta bara poster som finns i FIL.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FIL.po    bearbeta bara poster som inte finns i FIL.po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 samma som --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              samma som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:537
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntax på infil:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      infil har \"Java .properties\"-syntax\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1091,17 +1085,41 @@ msgstr ""
 "      --stringtable-input     infil har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:545 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:549 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 använd alltid färger och andra textattribut\n"
+"      --color=VILLKOR         använd färger och andra textattribut beroende "
+"på\n"
+"                              VILLKOR, som kan vara \"always\", \"never\", "
+"\"auto\"\n"
+"                              eller \"html\".\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1109,9 +1127,9 @@ msgstr ""
 "  -e, --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:449 src/msgmerge.c:551 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1119,28 +1137,28 @@ msgstr ""
 "  -E, --escape                använd C-kontrollsekvenser i resultatet, men\n"
 "                              inte \\v aller \\a\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:553
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              skriv PO-fil även om den är tom\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1148,39 +1166,39 @@ msgstr ""
 "  -n, --add-location          skriv rader med \"#: filnamn:rad"
 "\" (normalläge)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:565 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    skriv en NeXTstep/GNUstep \".strings\"-fil\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:567 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANTAL           välj antal kolumner i resultatet\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:569 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1189,26 +1207,26 @@ msgstr ""
 "      --no-wrap               dela inte meddelanden som är längre än\n"
 "                              resultatets kolumnantal i flera rader\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:472 src/msgmerge.c:572 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortera resultatet\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:474 src/msgmerge.c:574 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sortera resultatet efter filposition\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "omöjligt urvalskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]...\n"
@@ -1236,23 +1254,23 @@ msgstr ""
 "utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
 "definierar dem.  Filpositioner från alla filer bevaras.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   infiler\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FIL        läs lista av infiler från FIL\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Om infil är - läses standard in.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1270,7 +1288,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 0\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1279,16 +1297,16 @@ msgstr ""
 "  -u, --unique                samma som --less-than=2, begär att\n"
 "                              endast unika meddelanden skrivs\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:539
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      infiler har \"Java .properties\"-syntax\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:541
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1297,12 +1315,12 @@ msgstr ""
 "      --stringtable-input     infiler har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMN          kodning för resultatet\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1311,53 +1329,33 @@ msgstr ""
 "      --use-first             använd först hittade översättning för varje\n"
 "                              meddelande, slå inte ihop översättningar\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:547
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 använd alltid färger och andra textattribut\n"
-"      --color=VILLKOR         använd färger och andra textattribut beroende "
-"på\n"
-"                              VILLKOR, som kan vara \"always\", \"never\", "
-"\"auto\"\n"
-"                              eller \"html\".\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:337
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:348
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "inga infiler givna"
 
-#: src/msgcmp.c:183 src/msgmerge.c:353
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exakt 2 infiler krävs"
 
-#: src/msgcmp.c:202 src/msgmerge.c:462
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Användning: %s [FLAGGA] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1375,22 +1373,22 @@ msgstr ""
 "programmet.  Om en exakt likhet inte kan hittas används luddig jämförelse \n"
 "för att ge bättre felmeddelanden.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      översättningar\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referenser till källkod\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:528
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Bearbetningsvarianter:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:530
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1398,59 +1396,64 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          tillämpa ref.pot till alla domäner i def.po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     använd inte luddig jämförelse\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             använd luddiga poster i resultatet\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      beakta oöversatta meddelanden\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "detta meddelande är oöversatt"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "detta meddelande behöver granskas av översättaren"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1354
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "detta meddelande används men är inte definierat..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1357
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denna definition är likartad"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1387
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "detta meddelande används men är inte definierat i %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d allvarligt fel hittat"
 msgstr[1] "%d allvarliga fel hittades"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst två filer måste anges"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1471,7 +1474,7 @@ msgstr ""
 "endast från den första PO-filen som definierar dem. Filpositioner från\n"
 "alla filer bevaras.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1480,41 +1483,41 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           skriv inte ut huvudet med 'msgid \"\"'\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterar en meddelandekatalog till en annan teckenkodning.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Konverteringsmål:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Standardvärde är nuvarande lokals kodning.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:555
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:557
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:559
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1522,28 +1525,28 @@ msgstr ""
 "      --add-location          skriv rader med \"#: filnamn:rad"
 "\" (normalläge)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:561
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgen.c:236 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "inga infiler givna"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "exakt en infil krävs"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Användning: %s [FLAGGA] INFIL\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1555,22 +1558,22 @@ msgstr ""
 "engelska PO-filen eller en PO-mönsterfil (ofta skapad med xgettext).\n"
 "Oöversatta poster ges en översättning som är identisk med msgid.\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INFIL                       PO- eller POT-infil\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "kommandonamn saknas"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Användning: %s [FLAGGA] KOMMANDO [KOMMANDOFLAGGOR]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1585,7 +1588,7 @@ msgstr ""
 "blir utdata från msgexec.  Slutstatusvärdet för msgexec är det maximala\n"
 "slutstatusvärdet för alla kommandokörningar.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1595,42 +1598,42 @@ msgstr ""
 "av ett nolltecken.  Utdata för \"msgexec 0\" är lämpligt som indata för\n"
 "\"xargs -O\"\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INFIL           PO-infil\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "skrivning till standard ut misslyckades"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning till %s-barnprocess misslyckades"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "filternamn saknas"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst ett sed-skript måste anges"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Tillämpar ett filter på alla översättningar i en meddelandekatalog.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1639,19 +1642,19 @@ msgstr ""
 "FILTER kan vara vilket program som helst som läser en översättning från\n"
 "standard in och skriver den modifierade översättningen till standard ut.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Användbara FILTERFLAGGOR när FILTER är \"sed\":\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SKRIPT     lägg till SKRIPT till kommandon att exekvera\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1662,7 +1665,7 @@ msgstr ""
 "kommandon\n"
 "                                att exekvera\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
@@ -1670,7 +1673,7 @@ msgstr ""
 "  -n, --quiet, --silent       undertryck automatisk utskrift av "
 "mönsterutrymmet\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1678,12 +1681,12 @@ msgstr ""
 "      --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indentera resultatet\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1691,100 +1694,82 @@ msgstr ""
 "      --keep-header           bevara huvudrader oförändrade, filtrera dem "
 "inte\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Inte implementerad ännu."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "kan inte sätta upp icke-blockerande I/O till %s-barnprocess"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "kommunikation med %s-barnprocess misslyckades"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "läsning från %s-barnprocess misslyckades"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s-barnprocess avslutade med slutstatus %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet till %s ska vara ett enskilt skiljetecken"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ogiltig byteordning: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kräver att \"-d katalog\" anges"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kräver att \"-l lokal\" anges"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s är endast giltig med %s eller %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s är endast giltig med %s, %s eller %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d översatt meddelande"
 msgstr[1] "%d översatta meddelanden"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d luddig översättning"
 msgstr[1] ", %d luddiga översättningar"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d oöversatt meddelande"
 msgstr[1] ", %d oöversatta meddelanden"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1793,17 +1778,17 @@ msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 "Motsvarande gäller för frivilliga argument.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnamn.po ...              infiler\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:494 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Körläge:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1812,7 +1797,7 @@ msgstr ""
 "  -j, --java                  Javaläge: generera en Java ResourceBundle-"
 "klass\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1821,12 +1806,12 @@ msgstr ""
 "      --java2                 som --java, och anta Java2 (JDK 1.2 eller "
 "högre)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1835,7 +1820,7 @@ msgstr ""
 "      --csharp-resources      C#-resursläge: generera en .NET .resources-"
 "fil\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1843,33 +1828,33 @@ msgstr ""
 "      --tcl                   Tcl-läge: generera en .msg-fil av tcl/msgcat-"
 "typ\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-läge: generera en Qt .qm-fil\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Om UTFIL är - skrivs resultatet till standard ut.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Plats för utfil i Javaläge:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURS       resursnamn\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1877,13 +1862,13 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKAL          lokalnamn, antingen språk eller språk_LAND\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d KATALOG                  startkatalog för klassers katalogträd\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1895,12 +1880,12 @@ msgstr ""
 "avskiljt med ett understreck.  Flaggan -d är obligatorisk.  Klassen skrivs\n"
 "till den givna katalogen.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Plats för utfil i C#-läge:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1908,7 +1893,7 @@ msgid ""
 msgstr ""
 "  -d KATALOG                  startkatalog för lokalberoende .dll-filer\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1918,18 +1903,18 @@ msgstr ""
 "underkatalog\n"
 "till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Plats för utfil i Tcl-läge:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  startkatalog för .msg-meddelandekataloger\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1938,12 +1923,12 @@ msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .msg-filen skrivs till den givna\n"
 "katalogen.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning av infil:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1954,13 +1939,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrollera språkberoende formatsträngar\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1968,7 +1953,7 @@ msgid ""
 msgstr ""
 "      --check-header          verifiera närvaro och innehåll av huvudrader\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1977,7 +1962,7 @@ msgstr ""
 "      --check-domain          kontrollera konflikter mellan domändirektiv\n"
 "                                och flaggan --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1986,7 +1971,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrollera att GNU msgfmt uppför sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1997,98 +1982,98 @@ msgstr ""
 "tangentkortkommandon\n"
 "                                för menyer\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             använd luddiga poster i resultatet\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=TAL         lägg strängar på jämna TAL byte (normalt: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               binärfil innehåller inte hashtabellen\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            skriv ut statistik om översättningarna\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:583 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               öka mängden information i meddelanden\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "varning: konvertering till användarens teckenuppsättning kommer att "
 "misslyckas.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varning: PO-filens huvudrader är luddiga\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2097,7 +2082,7 @@ msgstr ""
 "flagga \"%c\" kan inte användas förrän \"J\", \"K\", \"T\" \"C\" eller \"X\" "
 "angivits"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2106,7 +2091,7 @@ msgstr ""
 "Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n"
 "mönster eller hör till någon given källkodsfil.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2182,7 +2167,7 @@ msgstr ""
 "  -v, --invert-match          skriv ut endast de meddelanden som inte matchar\n"
 "                              något urvalskriteria.\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2190,17 +2175,17 @@ msgstr ""
 "      --escape                använd C-kontrollsekvenser i resultatet, men\n"
 "                                inte \\v eller \\a\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sortera resultatet\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sortera resultatet efter filposition\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2210,7 +2195,7 @@ msgstr ""
 "LANG såsom beskrivs i filen ABOUT-NLS.  Detta är nödvändigt för att\n"
 "du ska kunna testa dina översättningar.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2221,12 +2206,12 @@ msgstr ""
 "Ange lokal med flaggan --locale eller\n"
 ".po-utfilen med flaggan --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Skapade %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2235,12 +2220,12 @@ msgstr ""
 "Skapar en ny PO-fil och initierar metainformation med värden från\n"
 "användarens miljövariabler.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INFIL           POT-infil\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2250,13 +2235,13 @@ msgstr ""
 "Om ingen infil ges söks POT-filen i aktuell katalog.\n"
 "Om den är - läses standard in.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=FIL       skriv resultatet till den givna PO-filen\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2265,18 +2250,18 @@ msgstr ""
 "Om ingen utfil ges beror den på flaggan --locale eller användarens\n"
 "lokalinställning.  Om den är - skrivs resultatet till standard ut.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          sätt mållokal\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         antag att PO-filen är automatgenererad\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2284,12 +2269,12 @@ msgstr ""
 "Hittade fler än en .pot-fil.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "fel vid läsning av aktuell katalog"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2297,14 +2282,14 @@ msgstr ""
 "Hittade ingen .pot-fil i aktuell katalog.\n"
 "Ange .pot-infil med flaggan --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s-barnprocess terminerade med slutstatus %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2319,28 +2304,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1474
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Svenska översättningar för paket %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuvarande teckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "infilen \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2348,19 +2333,19 @@ msgid ""
 msgstr ""
 "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "varning: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2369,7 +2354,7 @@ msgstr ""
 "Infiler har meddelanden med flera kodningar, däribland UTF-8.\n"
 "Konverterar resultatet till UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2381,7 +2366,7 @@ msgstr ""
 "Konverterar resultatet till UTF-8.\n"
 "Använd flaggan --to-code för att välja en annan kodning.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2395,7 +2380,7 @@ msgstr ""
 "eller se till att de är UTF-8-kodade från början, d.v.s. redan i dina\n"
 "källkodsfiler.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2408,12 +2393,12 @@ msgstr ""
 "Resultatet för \"%s\" kan bli felaktigt.\n"
 "Möjliga sätt att komma runt problemet är:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Sätt LC_ALL till en lokal med kodning %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2424,7 +2409,7 @@ msgstr ""
 "  tillämpa därefter \"%s\",\n"
 "  konvertera sedan tillbaka till %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2437,7 +2422,7 @@ msgstr ""
 "  tillämpa därefter \"%s\"\n"
 "  konvertera sedan tillbaka till %s med \"msgconv\".\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2448,74 +2433,74 @@ msgstr ""
 "Resultatet för \"%s\" kan bli felaktigt.\n"
 "Ett möjligt sätt att komma runt problemet är att sätta LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "pluraluttryck kan producera negativa värden"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men pluraluttryck kan ge värden upp till %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "pluraluttryck kan ge division med noll"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "pluraluttryck kan ge heltalsspill"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "pluraluttryck kan ge aritmetiska fel, möjligen division med noll"
 
-#: src/msgl-check.c:227
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Försök använda den här, gäller för \"%s\":"
 
-#: src/msgl-check.c:313 src/msgl-check.c:337
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "meddelandekatalog har översättningar med pluralform"
 
-#: src/msgl-check.c:315
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "men huvudrader saknar attribut av typ \"plurals=UTTRYCK\""
 
-#: src/msgl-check.c:339
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "men huvudrader saknar ett attribut av typ \"nplurals=HELTAL\""
 
-#: src/msgl-check.c:375
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ogiltigt värde för nplurals"
 
-#: src/msgl-check.c:397
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ogiltigt pluraluttryck"
 
-#: src/msgl-check.c:427 src/msgl-check.c:443
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:429
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "men några meddelanden har bara en pluralform"
 msgstr[1] "men några meddelanden har bara %lu pluralformer"
 
-#: src/msgl-check.c:445
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "men några meddelanden har en pluralform"
 msgstr[1] "men några meddelanden har %lu pluralformer"
 
-#: src/msgl-check.c:469
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2523,83 +2508,83 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad "
 "med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
 
-#: src/msgl-check.c:563
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:571
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:586
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:604
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:612
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:627
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "hantering av plural är en utökning i GNU gettext"
 
-#: src/msgl-check.c:682
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:738
+#: src/msgl-check.c:776
 #, fuzzy, c-format
 msgid "header field `%s' missing in header\n"
 msgstr "huvudrad \"%s\" saknas i huvudet\n"
 
-#: src/msgl-check.c:746
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "huvudrad \"%s\" bör ligga i början på raden\n"
 
-#: src/msgl-check.c:771
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "vissa huvudrader har kvar initiala standardvärden\n"
 
-#: src/msgl-check.c:788
+#: src/msgl-check.c:826
 #, fuzzy, c-format
 msgid "header field `%s' still has the initial default value\n"
 msgstr "vissa huvudrader har kvar initiala standardvärden\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: indata är inte giltig i teckenkodningen \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: fel uppstod vid konvertering från teckenuppsättning \"%s\" till "
 "teckenuppsättning \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2608,7 +2593,7 @@ msgstr ""
 "Kan inte konvertera från \"%s\" till \"%s\".  %s beror på iconv()\n"
 "och iconv() stöder inte denna konvertering."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2617,8 +2602,8 @@ msgstr ""
 "Konvertering från \"%s\" till \"%s\" ger duplikat: några msgid som skiljer "
 "sig blir lika."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2627,16 +2612,16 @@ msgstr ""
 "Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n"
 "Denna version byggdes utan iconv()."
 
-#: src/msgmerge.c:370 src/msgmerge.c:376
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s är endast giltig med %s"
 
-#: src/msgmerge.c:430
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "säkerhetskopieringstyp"
 
-#: src/msgmerge.c:467
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2659,19 +2644,19 @@ msgstr ""
 "dock bevaras punktkommentarer och filpositioner.  Om en exakt likhet\n"
 "inte kan hittas används luddig jämförelse för att ge bättre resultat.\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 "  def.po                      översättningar som refererar till gamla "
 "källkoden\n"
 
-#: src/msgmerge.c:486
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referenser till den nya källkoden\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2680,7 +2665,7 @@ msgstr ""
 "  -C, --compendium=FIL        ytterligare kataloger med översättningar,\n"
 "                              kan anges flera gånger\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2689,27 +2674,27 @@ msgstr ""
 "  -U, --update                updatera def.po,\n"
 "                              gör ingenting om def.po redan är aktuell\n"
 
-#: src/msgmerge.c:508
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Plats för utfil i uppdateringsläge:\n"
 
-#: src/msgmerge.c:510
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Resultatet skrivs tillbaka till def.po.\n"
 
-#: src/msgmerge.c:512
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROLL       gör en säkerhetskopia av def.po\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         använd ett annat suffix än det vanliga\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2728,7 +2713,7 @@ msgstr ""
 "annars\n"
 "  simple, never   gör alltid enkla säkerhetskopior\n"
 
-#: src/msgmerge.c:523
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2738,12 +2723,7 @@ msgstr ""
 "Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n"
 "miljövariabeln SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:532
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     använd inte luddig jämförelse\n"
-
-#: src/msgmerge.c:534
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2751,22 +2731,22 @@ msgstr ""
 "      --previous              behåll föregående \"msgid\" för översatta "
 "meddelanden\n"
 
-#: src/msgmerge.c:585
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       visa inte förloppsindikatorer\n"
 
-#: src/msgmerge.c:1460
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "detta meddelande ska definiera pluralformer"
 
-#: src/msgmerge.c:1483
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "detta meddelande ska inte definiera pluralformer"
 
-#: src/msgmerge.c:1821
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2775,27 +2755,29 @@ msgstr ""
 "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld "
 "saknade, %ld föråldrade.\n"
 
-#: src/msgmerge.c:1829
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " klar.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s och explicita filnamn är ömsesidigt uteslutande"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Användning: %s [FLAGGA] [FIL]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Konvertera en binär meddelandekatalog till en .po-fil av Uniforum-typ\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2804,12 +2786,12 @@ msgstr ""
 "  -j, --java                  Javaläge: indata är en Java ResourceBundle-"
 "klass\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C#-läge: indata är en .NET .dll-fil\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2818,7 +2800,7 @@ msgstr ""
 "      --csharp-resources      C#-resursläge: indata är en .NET .resources-"
 "fil\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2826,17 +2808,17 @@ msgstr ""
 "      --tcl                   Tcl-läge: indata är en .msg-fil av tcl/msgcat-"
 "typ\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FIL ...                     .mo-infiler\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Plats för infil i Javaläge:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2846,12 +2828,12 @@ msgstr ""
 "Klassnamnet härleds genom att lägga till lokalnamnet till resursnamnet\n"
 "avskiljt med ett understreck.  Klassen söks med hjälp av CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Plats för infil i C#-läge:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2861,12 +2843,12 @@ msgstr ""
 "underkatalog\n"
 "till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Plats för infil i Tcl-läge:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2875,17 +2857,17 @@ msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .msg-filen ligger i den givna\n"
 "katalogen.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2907,12 +2889,12 @@ msgstr ""
 "översättningen.  Filpositioner samlas ihop.\n"
 "När flaggan --unique anges kastas duplikat bort.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              skriv bara duplicerade meddelanden\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2920,7 +2902,7 @@ msgid ""
 msgstr ""
 "  -u, --unique                skriv bara unika meddelanden, duplikat kastas\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<standard in>"
@@ -3007,65 +2989,65 @@ msgstr "första pluralformen har index som inte är noll"
 msgid "plural form has wrong index"
 msgstr "pluralform har fel index"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "för många fel, avbryter körningen"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:713 src/write-po.c:842
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ogiltig flerbytesekvens"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ofullständig flerbytesekvens i slutet på filen"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ofullständig flerbytesekvens i slutet på raden"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv misslyckades"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "nyckelordet \"%s\" är okänt"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "ogiltig kontrollsekvens"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "filslut inne i en sträng"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "radslut inne i en sträng"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontextseparator <EOT> inne i sträng"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denna fil kan inte innehålla domändirektiv"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "meddelandedefinitionen är dubblerad"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "detta är platsen för den första definitionen"
 
@@ -3153,17 +3135,17 @@ msgstr ""
 "fel uppstod vid konvertering från teckenuppsättning \"%s\" till "
 "teckenuppsättning \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "förväntade två argument"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Användning: %s [FLAGGA] URL FIL\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3172,11 +3154,26 @@ msgstr ""
 "Hämtar och skriver ut innehållet på URL.  Om URL inte kan hämtas används\n"
 "den lokala filen FIL istället.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fel vid skrivning till standard ut"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3228,33 +3225,33 @@ msgstr "kan inte skapa utfilen \"%s\""
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "misslyckades med att skapa katalogen \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "kompilering av C#-klass misslyckades, försök med --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "kompilering av C#-klass misslyckades"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "inte ett giltigt Javaklassnamn: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
@@ -3264,14 +3261,14 @@ msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
-#: src/write-po.c:776
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
 
-#: src/write-po.c:1227 src/write-po.c:1356
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3284,7 +3281,7 @@ msgstr ""
 "teckenuppsättning än du.  Försök använda en ren ASCII-msgctxt istället.\n"
 "%s\n"
 
-#: src/write-po.c:1239 src/write-po.c:1368
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3307,8 +3304,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3331,7 +3328,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "fel vid skrivning till subprocess %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3339,7 +3336,7 @@ msgstr ""
 "meddelandekatalog har kontextberoende översättningar men formatet för\n"
 "C# .resources stödjer inte kontexter\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3363,36 +3360,34 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer men formatet för\n"
 "Tcl-meddelandekataloger stöder inte pluralhantering\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varning: oavslutad teckenkonstant"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Sträng är inte i ASCII i %s%s.\n"
 "Ange källkodning med --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3401,7 +3396,7 @@ msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3411,7 +3406,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code.\n"
 "\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3421,7 +3416,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code.\n"
 "\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3430,12 +3425,12 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv misslyckades"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3445,32 +3440,32 @@ msgstr ""
 "Ange korrekt källkodning med --from-code.\n"
 "\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: varning: ogiltigt Unicodetecken"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: varning: oavslutad strängkonstant"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: varning: \")\" hittades där \"}\" förväntades"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varning: \"}\" hittades där \")\" förväntades"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3479,50 +3474,49 @@ msgstr ""
 "Språk \"glade\" stöds ej. %s beror på expat.\n"
 "Denna version byggdes utan expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: varning: ensamt surrogat U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: hittar inte strängslutet \"%s\" någonstans före filslut"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: höger krullparentes fattas i \\x{HEXNUMMER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\l\") för åttabitarstecknet \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\u\") för åttabitarstecknet \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: ogiltig variabelinterpolation vid \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\L\") för åttabitarstecknet \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\U\") för åttabitarstecknet \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3530,7 +3524,7 @@ msgstr ""
 "Ange källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3541,7 +3535,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3552,7 +3546,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3563,7 +3557,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3574,7 +3568,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3585,27 +3579,27 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Okänd kodning \"%s\". Fortsätter med ASCII istället."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ogiltig strängdefinition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d fattas tal efter #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ogiltigt strängmönster"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3614,28 +3608,28 @@ msgstr ""
 "%s:%lu: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; "
 "använd eval_gettext istället"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan inte användas då resultatet skrivs till standard ut"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext måste ha nyckelord att söka efter för att fungera"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahera översättbara strängar från givna infiler.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3644,23 +3638,23 @@ msgstr ""
 "  -d, --default-domain=NAMN  använd NAMN.po som utfil (i st.f. messages."
 "po) \n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=KATALOG    utfiler placeras i katalogen KATALOG\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Språkval i infiler:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3679,19 +3673,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   samma som --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "I normalläge gissas språket från filändelsen på infilen.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3700,42 +3694,45 @@ msgstr ""
 "      --from-code=NAMN        kodning av infiler\n"
 "                                (utom för Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Normalt antas att filer är i ASCII-format.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         slå ihop meddelanden med existerande fil\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FIL.po   rader från FIL tas inte ut\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=MÄRKE]  skriv kommentarsblock med MÄRKE (eller de\n"
 "                              före nyckelordsrader) till resultatet\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Språkspecifika val:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahera alla strängar\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3748,17 +3745,17 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=ORD]         extra nyckelord att titta efter (om ORD\n"
 "                              utelämnas, titta inte efter "
 "standardnyckelord)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3768,7 +3765,7 @@ msgstr ""
 "      --flag=ORD:NR:FLAGGA    extra FLAGGA för strängar inne i argument\n"
 "                              nummer NR för nyckelord ORD\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3781,73 +3778,73 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             hantera ANSI C treteckenssekvenser i infiler\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (bara språken C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    känn igen Qt-formatsträngar\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (bara språket C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   känn igen KDE 4 formatsträngar\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 mer detaljerad igenkänning av formatsträngar\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRÄNG  sätt copyrightinnehavare i resultatet\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          utelämna FSF copyrighttext i resultatet\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    sätt paketnamn i utdata\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  sätt paketversion i utdata\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3855,25 +3852,27 @@ msgstr ""
 "      --msgid-bugs-address=EPOST@ADRESS   sätt mottagare för msgid-"
 "felrapporter\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG eller "
 "\"\"\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med STRÄNG eller "
 "\"\"\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3881,16 +3880,31 @@ msgid ""
 msgstr ""
 "Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard in"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varning: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3899,7 +3913,7 @@ msgstr ""
 "%s är inte en giltig formatsträng för %s trots att den används i en "
 "formatsträngsposition. Orsak: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3908,7 +3922,7 @@ msgstr ""
 "%s är inte en giltig formatsträng för %s trots att den är deklarerad som en. "
 "Orsak: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3922,7 +3936,7 @@ msgstr ""
 "Överväg att istället använda en formatsträng med namngivna argument\n"
 "och en mappning istället för en lista för argumenten.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3932,27 +3946,27 @@ msgstr ""
 "gettext(\"\") returnerar huvudet med metainformation,\n"
 "inte den tomma strängen.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "varning: kontext saknas för pluralargumentet till nyckelordet \"%.*s\""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontext misstämmer mellan singular- och pluralformen"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3964,7 +3978,7 @@ msgstr ""
 "på variabeln MSGID_BUGS_ADDRESS där, annars ange\n"
 "flaggan --msgid-bugs-address på kommandoraden.\n"
 
-#: src/xgettext.c:3036
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "språket \"%s\" okänt"
@@ -3973,5 +3987,26 @@ msgstr "språket \"%s\" okänt"
 msgid "<unnamed>"
 msgstr "<utan namn>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: otillåten flagga -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle misslyckades med felkod 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Inte implementerad ännu."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "kan inte sätta upp icke-blockerande I/O till %s-barnprocess"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "kommunikation med %s-barnprocess misslyckades"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "läsning från %s-barnprocess misslyckades"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s-barnprocess avslutade med slutstatus %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"

diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 5ddc02b6df5b11b92573a486ec4493c36b25df87..6ad1f96f071558207120ea4e72a7a5cec1b8f771 100644 (file)
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-07-09 09:21+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"
@@ -31,22 +32,22 @@ msgstr "argüman %s, %s için belirsiz"
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "geçici dizin bulunamadı, $TMPDIR ortam değişkeniyle belirtmeyi deneyin"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "\"%s\" şablonu kullanılarak bir geçici dizin oluşturulamaz"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "geçici dosya %s silinemiyor"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "geçici dizin %s silinemiyor"
@@ -55,44 +56,44 @@ msgstr "geçici dizin %s silinemiyor"
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "\"%s\" yedek dosyası yazılmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" okunduktan sonra hata"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() başarısız"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# derleyici bulunamadı, pnet kurmayı deneyin"
@@ -102,74 +103,73 @@ msgstr "C# derleyici bulunamadı, pnet kurmayı deneyin"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s alt süreci başarısız"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, 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:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, 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:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, 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/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -181,20 +181,20 @@ msgstr "compile_java_class'ın source_version argümanı geçersiz"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class'ın target_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -207,20 +207,20 @@ msgstr ""
 "Java sanal makinası bulunamadı,\n"
 "ya gij kurun ya da $JAVA değişkenini belirleyin"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -239,71 +239,70 @@ msgstr "veriyolu oluşturulamıyor"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s alt süreci"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
 
 #: src/format-boost.c:449
@@ -334,9 +333,9 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -380,48 +379,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Dizge, %u yönerge numarasının hemen ardından gelen bir '}' içeriyor."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "%u numaralı yönergede seçeneklerin birleşimi geçersiz"
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "%u numaralı yönergede, hassaiyet için argüman numarası %u olmalı."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "%u numaralı yönergede, hassasiyet belirtimi geçersiz."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "%u numaralı yönergede, \"%c\" den önce imler olmamalı."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
 
 #: src/format-invalid.h:22
@@ -527,22 +526,21 @@ msgstr ""
 "gelmeyen bir numara içeriyor."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "{%u}.argüman için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri {%u} için aynı değil"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -558,11 +556,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "%u numaralı yönergede, çok fazla parametre verilmiş; en fazla %u parametre "
 "umuluyordu."
@@ -615,13 +613,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "Dizge bazı argümanlara uyumsuz bir yolla karşılık getirilmiş."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri aynı değil"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
 
@@ -634,12 +632,12 @@ msgstr ""
 "%u numaralı yönergede, boyut belirteci '%c' dönüşüm belirtimi ile uyumlu "
 "değil."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "'%s' için '%s' içinde bir biçem belirteci yok"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -647,47 +645,44 @@ msgstr ""
 "Dizge hem argüman isimlerine hem de numarasız argüman belirtimlerine "
 "karşılık geliyor."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Dizge '%s' isimli argümana uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir eşlem umulurken '%s' "
 "içindekilerle bir işlem umuluyor"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir işlem umulurken '%s' "
 "içindekilerle bir eşlem umuluyor"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' içinde '%1$s' için 'msgid' içinde bir biçem belirteci yok"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -730,11 +725,11 @@ msgid ""
 msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -743,38 +738,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
@@ -809,29 +804,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n"
@@ -840,11 +835,11 @@ msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
@@ -855,30 +850,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -887,33 +882,33 @@ msgstr ""
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -921,30 +916,30 @@ msgstr ""
 "  -D, --directory=DİZİN       girdi dosyasının arandığı listeye DİZİNi "
 "ekler\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=DOSYA     çıktıyı DOSYAya yazar\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -952,12 +947,12 @@ msgid ""
 msgstr ""
 "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -965,7 +960,7 @@ msgstr ""
 "      --translated            çevrilmiş iletileri tutar çevrilmemişleri "
 "siler\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -973,54 +968,54 @@ msgstr ""
 "      --untranslated          çevrilmemiş iletileri tutar çevrilmişleri "
 "siler\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' imli iletileri tutar\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           kullanımdışı olan #~ iletilerini siler\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         kullanımdışı olan #~ iletilerini tutar\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Nitelik değiştirme:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             tüm iletileri 'fuzzy' olarak imler\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           tüm 'fuzzy' imlerini kaldırır\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          tüm iletileri kullanımdışı yapar\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma "
 "sokar\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1028,14 +1023,14 @@ msgid ""
 msgstr ""
 "      --clear-previous        tüm iletilerden eski msgid'ler kaldırılır\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=DOSYA.po    sadece DOSYA.po içindeki girdileri değiştirir\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1043,29 +1038,29 @@ msgstr ""
 "      --ignore-file=DOSYA.po  sadece DOSYA.po içinde bulunmayan girdileri\n"
 "                              değiştirir\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1073,8 +1068,8 @@ msgstr ""
 "  -P, --properties-input      girdi dosyası Java .properties "
 "sözdizimindedir\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1083,17 +1078,35 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi "
 "dosyası\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1101,9 +1114,9 @@ msgstr ""
 "  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1112,28 +1125,28 @@ msgstr ""
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              boş bile olsa PO dosyasını yazar\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                .po dosyasını girintili tarzda yazar\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırları yazılmaz\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1141,25 +1154,25 @@ msgstr ""
 "  -n, --add-location          '#: dosyaismi:satır' satırları üretilir\n"
 "                              (öntanımlı\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                .po dosyasının bilinen biçeminde yazar.\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     çıktıyı bir Java .properties dosyasına yazar\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1167,16 +1180,16 @@ msgstr ""
 "      --stringtable-output    çıktıyı bir NeXTstep/GNUstep .strings\n"
 "                              dosyasına yazar\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SAYI            sayfa genişliğini SAYIya ayarlar\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1185,31 +1198,31 @@ msgstr ""
 "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
 "                              kısmı bir alt satıra indirilmez\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          çıktıyı dosyadaki yerine göre sıralar\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1233,24 +1246,24 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1259,7 +1272,7 @@ msgstr ""
 "  -<, --less-than=SAYI        bu SAYIdan daha fazla olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı sonsuzdur.\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1268,7 +1281,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      bu SAYIdan daha az olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı 0 dır.\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1277,8 +1290,8 @@ msgstr ""
 "  -u, --unique                --less-than=2 için kısaltmadır, sadece\n"
 "                              eşi olmayan iletiler basılır\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1286,8 +1299,8 @@ msgstr ""
 "  -P, --properties-input      girdi dosyaları Java .properties "
 "sözdizimlidir\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1296,12 +1309,12 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi\n"
 "                              dosyaları\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=İSİM          çıktı için kodlama\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1310,41 +1323,33 @@ msgstr ""
 "      --use-first             her ileti için mevcut olan ilk kullanılır,\n"
 "                              çok sayıda çeviri varsa bile alınmaz.\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "hiçbir girdi dosyası verilmemiş"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tam olarak 2 girdi dosyası gerekli"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Kullanımı: %s [SEÇENEK] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1360,22 +1365,22 @@ msgstr ""
 "ve çevirisini kontrol etmek için kullanışlıdır. Zorunlu eşleşme bulunamazsa,\n"
 "belirsiz (fuzzy) eşleştirme yapılır.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      çeviriler\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     kaynaklara bağlantılar\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "İşlem değiştiriciler:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1383,60 +1388,65 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ref.pot'u tüm def.po dosyalarına uygular\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     fuzzy eşleşmeler kullanılmaz\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             çıktıda fuzzy girdiler kullanılır\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --use-untranslated      çıktıda çevrilmemiş girdiler kullanılır\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "bu ileti çevrilmemiş"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "bu iletiyi çevirmenin gözden geçirmesi lazım"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "bu ileti kullanıldı ama tanımlı değil..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ama bu tanımlama benzer"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ölümcül hata bulundu"
 msgstr[1] "%d ölümcül hata bulundu"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "en az iki dosya belirtilmelidir"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1458,7 +1468,7 @@ msgstr ""
 "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
 "korunmuş olacaktır.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1467,42 +1477,42 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
 "      --omit-header           başlıktaki `msgid \"\"' girdisini yazmaz\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Bir çeviri kataloğunu başka bir karakter kodlamasına dönüştürür.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Dönüşüm hedefi:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1510,28 +1520,28 @@ msgstr ""
 "      --add-location          '#: dosyaismi:satır' satırları korunur\n"
 "                              (öntanımlı)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tam olarak 1 girdi dosyası gerekli"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] GİRDİDOSYASI\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1544,22 +1554,22 @@ msgstr ""
 "PO Şablon dosyasıdır. Çevirisiz girdilere msgid ile uyuşan bir çeviri\n"
 "yerleştirilir ve fuzzy olarak imlenir.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  GİRDİDOSYASI                PO ya da POT dosyası\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "komut ismi eksik"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK] KOMUT [KOMUT-SEÇENEĞİ]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1574,7 +1584,7 @@ msgstr ""
 "çıktısı olarak görünür. msgexec dönüş kodu olarak tüm çağrılardan\n"
 "elde edilen en yüksek dönüş kodunu verir.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1583,42 +1593,42 @@ msgstr ""
 "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n"
 "çıktılar.  \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    PO dosyası\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "standart çıktıya yazılamadı"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s alt sürecine yazılamadı"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "süzgeç ismi eksik"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "en az bir sed betiği belirtilmelidir"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK] SÜZGEÇ [SÜZGEÇ-SEÇENEĞİ]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1627,18 +1637,18 @@ msgstr ""
 "SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n"
 "standart çıktıya yazabilen herhangi bir programdır.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "SÜZGEÇ 'sed' iken kullanılan SÜZGEÇ-SEÇENEKleri:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=BETİK      BETİK çalıştırılacak komutlara eklenir\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1648,14 +1658,14 @@ msgstr ""
 "  -f, --file=BETİK            BETİK dosyasının içeriğini çalıştırılacak\n"
 "                              komutlara ekler\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       kalıp alanının otomatik basılmasını engeller\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1663,110 +1673,92 @@ msgstr ""
 "      --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           başlık değiştirilmeden korunur\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Henüz çalışmıyor."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s alt süreci ile haberleşilemedi"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s alt sürecinden okunamadı"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s argümanı bir noktalama işareti olmalıydı"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "bayt sırası geçersiz: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sadece %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sadece %s, %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d çevrilmiş ileti"
 msgstr[1] "%d çevrilmiş ileti"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d belirsiz çeviri"
 msgstr[1] ", %d belirsiz çeviri"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d çevrilmemiş ileti"
 msgstr[1] ", %d çevrilmemiş ileti"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1775,17 +1767,17 @@ msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n"
 "Benzer durum seçimlik argümanlar içinde geçerlidir.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1794,7 +1786,7 @@ msgstr ""
 "  -j, --java                  Java kipi: bir Java ResourceBundle sınıfı "
 "üretir\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1804,13 +1796,13 @@ msgstr ""
 "yüksek)\n"
 "                              kabul edilir\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# kipi: bir .NET .dll dosyası üretilir\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1819,53 +1811,53 @@ msgstr ""
 "      --csharp-resources      C# özkaynak kipi: bir .NET .resources dosyası\n"
 "                              üretilir\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl kipi:bir tcl/msgcat .msg dosyası üretilir\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Çıktı dosyası - verilmişse, standard çıktı kullanılır.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ÖZKAYNAK     özkaynak ismi\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=YEREL          yerel ismi, \"tr\" ya da \"tr_TR\"\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d DİZİN                    sınıf ana dizini\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1876,12 +1868,12 @@ msgstr ""
 "Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n"
 "saptanır. Sınıf DİZİNe yazılacağından -d seçeneği zorunludur.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1889,7 +1881,7 @@ msgid ""
 msgstr ""
 "  -d DİZİN                    yerele bağımlı .dll dosyaları için kök dizin\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1899,17 +1891,17 @@ msgstr ""
 "belirlenen\n"
 "dizinin bir altdizinine yazılır.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl kipte çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d DİZİN                   .msg ileti kataloglarının ana dizini\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1917,12 +1909,12 @@ msgid ""
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1933,13 +1925,13 @@ msgstr ""
 "domain\n"
 "                              için kısaltma\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          dile bağlı biçem dizgeleri kontrol edilir\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1948,7 +1940,7 @@ msgstr ""
 "      --check-header          başlık girdilerilerinin varlığı ve içeriği\n"
 "                              kontrol edilir\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1957,7 +1949,7 @@ msgstr ""
 "      --check-domain          --output-file seçeneği ile paket yönergeleri\n"
 "                              arasındaki çelişkiler kontrol edilir\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1965,7 +1957,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1975,98 +1967,98 @@ msgstr ""
 "      --check-accelerators[=KRKT]  menü öğeleri için tuş belirticiler\n"
 "                                   kontrol edilir\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             çıktıda fuzzy girdiler kullanılır\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=SAYI        dizgeleri SAYI bayta ayarlar (öntanımlı: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               ikilik dosya saçılma tablosunu içermeyecek\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            çeviriler hakkındaki istatistikleri basar\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               daha ayrıntılı çıktı verilir\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uyarı: PO dosya başlığı fuzzy\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2075,7 +2067,7 @@ msgstr ""
 "'%c' seçeneği 'J', 'K', 'T', 'C' veya 'X' harflerinden biri belirtilmeden "
 "önce kullanılamaz"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2084,7 +2076,7 @@ msgstr ""
 "Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n"
 "bir çeviri kataloğunun tüm iletilerini çıkarır.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2162,7 +2154,7 @@ msgstr ""
 "  -v, --invert-match        sadece bir seçim kriteri ile eşleşmeyen iletiler\n"
 "                            çıktılanır\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2171,17 +2163,17 @@ msgstr ""
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sıralı çıktı üretir\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sıralama dosyanın yerine göre yapılır\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2191,7 +2183,7 @@ msgstr ""
 "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n"
 "Bu çevirinizi test edebilmeniz için gereklidir.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2202,24 +2194,24 @@ msgstr ""
 "Lütfen --locale seçeneğinden bir yerel ya da\n"
 "--output-file seçeneğinden .po çıktı dosyası belirtin.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s oluşturuldu.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "Kullanıcının ortam değişkenlerindeki bilgilerle bir yeni PO dosyası oluşturur.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    POT dosyası\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2229,12 +2221,12 @@ msgstr ""
 "Girdi dosyası verilmemişse, POT dosyası içinde bulunulan dizinde aranır,\n"
 "- verilmişse standart girdi okunur.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=DOSYA     çıktı belirtilen PO dosyasına yazılır\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2243,19 +2235,19 @@ msgstr ""
 "Çıktı dosyası verilmemişse, --locale seçeneği ya da kullanıcının yerel\n"
 "ayarları kullanılır, - verilmişse sonuçlar standart çıktıya yazılır.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         PO dosyasının otomatik üretildiği varsayılır\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2264,12 +2256,12 @@ msgstr ""
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "dizin okunurken hata"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2278,14 +2270,14 @@ msgstr ""
 "Lütfen girdi olarak kullanılacak .pot dosyasını --input seçeneği ile "
 "belirtin.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s alt süreci çıkış kodu %d ile başarısız"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2300,28 +2292,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş."
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2330,19 +2322,19 @@ msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
 "kümesi belirtilmemiş"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2351,7 +2343,7 @@ msgstr ""
 "Girdi dosyası UTF-8 ile karışık farklı kodlamalar içeriyor.\n"
 "Çıktı UTF-8'e dönüştürülüyor.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2363,7 +2355,7 @@ msgstr ""
 "Çıktı UTF-8'e çevriliyor.\n"
 "--to-code seçeneğini kullanarak başka bir kodlama da seçebilirsiniz.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2377,7 +2369,7 @@ msgstr ""
 "dosyalarınızdaki gibi başından itibaren UTF-8 kodlanmış olmalarını "
 "sağlayın.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2390,12 +2382,12 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Yapılabilecekler:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL değişkenini %s kodlamasını kullanan bir yerele ayarlayın.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2406,7 +2398,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2419,7 +2411,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2430,75 +2422,75 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ama çoğul ifadeler en çok %lu değer üretebilir"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Aşağıdakiler %s için geçerli mi diye kullanmayı dene:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler sadece %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2506,82 +2498,82 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen başlıkta\n"
 "\"Plural-Forms: nplurals=TAMSAYI; plural=İFADE;\" gibi bir şey yok."
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "başlıkta `%s' başlık alanı yok\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: girdi \"%s\" kodlama için geçersiz"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2590,7 +2582,7 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
 "ve iconv() bu dönüşümü desteklemiyor."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2599,8 +2591,8 @@ msgstr ""
 " \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı "
 "oluyor."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2609,16 +2601,16 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n"
 "Bu sürüm iconv() olmaksızın kurgulanmış."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sadece %s ile geçerlidir"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2641,17 +2633,17 @@ msgstr ""
 "Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n"
 "belirsiz eşleşmeler kullanılmıştır.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      eski kaynaklara bağlı çeviriler\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     yeni kaynaklara bağlar\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2660,7 +2652,7 @@ msgstr ""
 "  -C, --compendium=DOSYA      ileti çevirileri için ek veritabanı, birden\n"
 "                              fazla belirtilebilir\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2669,27 +2661,27 @@ msgstr ""
 "  -U, --update                def.po dosyasını günceller,\n"
 "                              def.po zaten güncelse bir şey yapmaz\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Güncelleme kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Sonuç gerisin geri def.po'ya yazılır.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po'nun yedeklemesini yapar\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SONEK          yedekleme sonek kullanarak yapılır\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2708,7 +2700,7 @@ msgstr ""
 "                              yedekleme yapılır\n"
 "  simple, never               daima basit yedekleme yapılır\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2718,34 +2710,29 @@ msgstr ""
 "--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n"
 "belrtilmedikçe yedeklenen dosyanın soneki `~' dir.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     fuzzy eşleşmeler kullanılmaz\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       işlemin ilerleyişi gösterilmez\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr ".bu ileti çoğul biçem olmalıydı"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2754,26 +2741,28 @@ msgstr ""
 "%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
 "kullanılmayan ileti okundu.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " bitti.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ile diğer dosya isimleri bağdaşmıyor"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [DOSYA]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "İkilik ileti kataloğunu Uniforum tarzı .po dosyasına dönüştürür.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2782,13 +2771,13 @@ msgstr ""
 "  -j, --java              Java kipi: girdi bir  Java ÖzkaynakPaketi "
 "sınıfıdır\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# kipi: girdi bir .NET .dll dosyasıdır\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2797,24 +2786,24 @@ msgstr ""
 "      --csharp-resources      C# özkaynak kipi: girdi bir .NET .resources\n"
 "                              dosyasıdır\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl               Tcl kipi: girdi bir tcl/msgcat .msg dosyasıdır\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DOSYA ...                   girdi .mo dosyaları\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2824,12 +2813,12 @@ msgstr ""
 "Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n"
 "saptanır. Sınıf, CLASSPATH ortam değişkeni ile konumlanır.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2839,12 +2828,12 @@ msgstr ""
 "belirlenen\n"
 "dizinin bir altdizininde bulunur.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2852,17 +2841,17 @@ msgid ""
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı kullanılır\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                bilinen biçemde yazılır\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2883,12 +2872,12 @@ msgstr ""
 "onlar ilk çeviriden alınır. Dosya konumları korunur. --unique seçeneği\n"
 "kullanıldığında tekrarlananlar iptal edilir.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              sadece yinelenenler yazılır\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2897,7 +2886,7 @@ msgstr ""
 "  -u, --unique                sadece tek iletiler gösterilir,\n"
 "                              tekrarlananlar iptal edilir\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdÇ>"
@@ -2983,65 +2972,65 @@ msgstr "ilk çoğul biçemin indeksi sıfır değil"
 msgid "plural form has wrong index"
 msgstr "çoğul biçemin indeksi hatalı"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "dosya sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv başarısızlığı"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "anahtar-sözcük \"%s\" bilinmiyor"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "denetim dizisi geçersiz"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "dizge içinde dosya sonu"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "dizge içinde satır sonu"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "bu ilk tanımlamanın konumu"
 
@@ -3127,17 +3116,17 @@ msgstr "girdi \"%s\" kodlama için geçersiz"
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "iki argüman gerekiyor"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] URL DOSYA\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3146,11 +3135,26 @@ msgstr ""
 "Bir URL'nin içeriğini alır ve çıktılar.  URL erişilebilir değilse,\n"
 "yerel DOSYA dosya kullanılır.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "standart çıktıya yazılırken hata"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3192,43 +3196,43 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen çıktı biçimi çoğul "
 "çevirileri desteklemiyor."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" dizini oluşturulamadı"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Geçerli bir Java sınıfı ismi değil: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
 "$JAVAC ortam değişkenine uygun değeri atayın."
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3240,13 +3244,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3259,7 +3263,7 @@ msgstr ""
 "olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3282,8 +3286,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3308,7 +3312,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "%s alt süreçine yazarken hata"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3316,7 +3320,7 @@ msgstr ""
 "ileti kataloğu bağlama bağımlı çeviriler içermesine rağmen\n"
 "C# .resources biçimi bağlamları desteklemiyor\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3340,36 +3344,34 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen Tcl ileti kataloğu\n"
 "biçemi çoğul çevirileri desteklemiyor\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "%s%s içinde ASCII olmayan dizge.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3378,7 +3380,7 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3387,7 +3389,7 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3396,7 +3398,7 @@ msgstr ""
 "%s:%d: Dosyanın sonunda çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3405,12 +3407,12 @@ msgstr ""
 "%s:%d: Satırın sonunda çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3419,32 +3421,32 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabit"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3453,51 +3455,50 @@ msgstr ""
 "\"glade\" dili desteklenmiyor. %s expat'a bağlı.\n"
 "Bu sürüm expat olmaksızın kurgulanmış.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: EOF'dan önce hiçbir yerde \"%s\" dizge sonlandırıcısı bulunamadı"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} dizgesinde kapatan kuyruklu ayraç yok"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\l\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\u\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" içindeki değişken aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\L\") aradeğerlemesi geçersiz"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\U\") aradeğerlemesi geçersiz"
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3506,7 +3507,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3518,7 +3519,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3530,7 +3531,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3542,7 +3543,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3554,7 +3555,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3566,27 +3567,27 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: dizge ataması geçersiz"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d:  # dan sonra sayı yok"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: dizge ifade geçersiz"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3595,27 +3596,27 @@ msgstr ""
 "%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
 "kullanılmayacak; yerine eval_gettext kullanın"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "standart çıktıya yazılırken --join-existing kullanılamaz"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3623,23 +3624,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=DOSYA          çıktı belirtilen dosyaya yazılır\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DİZİN      çıktı dosyaları DİZİNe yazılır\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3658,19 +3659,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Öntanımlı olarak dil, girdi dosyasının uzantısına bakarak saptanır.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3679,42 +3680,45 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Öntanımlı olarak, girdi dosyalarının yerel kodlaması ASCII kabul edilir.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         iletiler mevcut dosyaya bağlanır\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DOSYA.po girdiler DOSYA.po dosyasından elde edilir\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3727,17 +3731,17 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=SÖZCÜK]      aranan ek anahtar sözcük (SÖZCÜK için "
 "öntanımlı\n"
 "                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3747,7 +3751,7 @@ msgstr ""
 "      --flag=SÖZCÜK:ARG:İM    SÖZCÜK anahtar sözcüğünün ARG numaralı\n"
 "                              argümanının içindeki dizge için ek im\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3761,56 +3765,56 @@ msgstr ""
 "Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C üçlü harfleri kabul edilir\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sadece bu diller: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     çıktı bir Java .properties dosyasına yazılır\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3818,17 +3822,17 @@ msgstr ""
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3836,42 +3840,59 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@ADRESİ\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=DİZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Bir --flag argümanı <sözcük>:<argnum>:[pass-]<im> sözdiziminde olmaz: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3880,16 +3901,16 @@ msgstr ""
 "Bir biçim dizgesi içinde kullanılabilirse de %s, %s biçim dizgesi içinde "
 "geçerli değil. Sebebi: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
 "%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3902,7 +3923,7 @@ msgstr ""
 "Lütfen isimli argümarları destekleyen bir biçim dizgesi kullanmayı\n"
 "ve argümanlar için bir demet yerine bir eşleme yapmayı düşünün.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3912,27 +3933,27 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uyarı: '%.*s' anahtar sözcüğünün çoğul biçimi için bağlam eksik"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3944,7 +3965,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
@@ -3953,6 +3974,30 @@ msgstr "dil `%s' bilinmiyor"
 msgid "<unnamed>"
 msgstr "<isimsiz>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Henüz çalışmıyor."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s alt süreci ile haberleşilemedi"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s alt sürecinden okunamadı"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "%%%c için çoklu başvuru."
 

diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 3306ad1e3920ca83528ded5222a57f8c3b4a1852..21b270820fcffa12f6305547deafcb2010d07dfc 100644 (file)
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2007-07-04 12:19+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
 "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"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -32,23 +33,23 @@ msgstr "неоднозначний аргумент %s для %s"
 msgid "Valid arguments are:"
 msgstr "Допустимі аргументи:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "не вдається знайти тимчасовий каталог, встановіть змінну $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
 "не вдається створити тимчасовий каталог при використанні шаблону \"%s\""
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "не вдається видалити тимчасовий файл \"%s\""
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "не вдається видалити тимчасовий каталог \"%s\""
@@ -57,44 +58,44 @@ msgstr "не вдається видалити тимчасовий катало
 msgid "write error"
 msgstr "помилка запису"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "помилка при відкриванні \"%s\" для читання"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "не вдається відкрити резервний файл \"%s\" для запису"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "помилка читання \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "помилка запису \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "помилка після читання \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "помилка у функції fdopen()"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Компілятор C# не знайдено, спробуйте встановити pnet"
@@ -104,74 +105,73 @@ msgstr "Компілятор C# не знайдено, спробуйте вст
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Не знайдено віртуальну машину pnet, спробуйте встановити pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "аварійне завершення створеного процесу %s"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `%s'\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: параметр `--%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: параметр `%c%s' має використовуватись без аргументів\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: невідомий параметр `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: невідомий параметр `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: неправильний параметр -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: неправильний параметр -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: параметр %c має використовуватись з аргументом\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: неоднозначний параметр `-W %s'\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: параметр `-W %s' має використовуватись без аргументів\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: параметр `%s' має використовуватись з аргументом\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,20 +183,20 @@ msgstr "некоректний аргумент source_version для compile_ja
 msgid "invalid target_version argument to compile_java_class"
 msgstr "некоректний аргумент target_version для compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не вдається створити \"%s\""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "помилка запису файлу \"%s\""
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -209,20 +209,20 @@ msgstr ""
 "Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну "
 "$JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "помилка вводу-виводу у дочірньому процесі %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -241,71 +241,70 @@ msgstr "не вдається створити канал"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "аварійне завершення DuplicateHandle з кодом помилки 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "аварійне завершення _open_osfhandle"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "не вдається створити файл виводу \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "дочірній процес %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "дочірній процес %s отримав фатальний сигнал %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' не є правильним рядком формату %s, на відміну від 'msgid'. Причина: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "в 'msgid' відсутня специфікація формату для аргументу %u, як у '%s'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "відсутня специфікація формату для аргументу %u у '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "в 'msgid' та '%s' не збігаються специфікації формату для %u"
 
 #: src/format-boost.c:449
@@ -338,9 +337,9 @@ msgstr ""
 "Рядок посилається на аргумент з номером %u, але ігнорується аргумент з "
 "номером %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не відповідає кількість специфікацій формату у 'msgid' та '%s'"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -385,18 +384,18 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Рядок містить одну дужку '}' після директиви %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "У директиві з номером %u, некоректна комбінація ключів."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 "У директиві з номером %u, не допускається визначник точності перед '%c'."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
@@ -405,7 +404,7 @@ msgstr ""
 "В директиві з номером %u, номер аргументу для визначника точності має "
 "дорівнювати %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -413,24 +412,24 @@ msgid ""
 msgstr ""
 "У директиві з номером %u, не допускається визначник точності перед '%c'."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "У директиві з номером %u, некоректний визначник точності."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "У директиві з номером %u, ключі не дозволяються перед '%c'."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' використовує %%m, а '%s' не використовує"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' не використовує %%m а '%s' використовує %%m"
 
 #: src/format-invalid.h:22
@@ -513,8 +512,8 @@ msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"У директиві з номером %u, номер аргументу не завершується комою та одним з\"%"
-"s\", \"%s\", \"%s\", \"%s\"."
+"У директиві з номером %u, номер аргументу не завершується комою та одним з"
+"\"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
@@ -531,21 +530,20 @@ msgstr ""
 "чи '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "специфікація формату аргументу {%u}, тобто '%s', не існує у 'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "специфікація формату аргументу {%u} не існує у '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "специфікації формату у 'msgid' та '%s' для аргументу {%u} не збігаються"
 
@@ -562,11 +560,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "У директиві з номером %u, вказано надто багато параметрів; очікувалось не "
 "більше ніж %u параметр."
@@ -623,13 +621,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "Рядок посилається на деякий аргумент несумісним способом."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "специфікації формату у 'msgid' та '%s' не еквівалентні"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "специфікації формату у '%s' не є підмножиною специфікацій з 'msgid'"
 
 #: src/format-perl.c:433
@@ -641,61 +639,58 @@ msgstr ""
 "У директиві з номером %u, специфікація розміру несумісна з специфікацією "
 "перетворення '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "специфікація формату для аргументу '%s' не існує у '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "Рядок посилається як на аргументи з назвами, так і на аргументи без назв."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Рядок посилається на аргумент з назвою '%s' несумісним способом."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "специфікації формату у 'msgid' очікують відображення, а специфікації у '%s' "
 "вимагають кортеж"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "специфікації формату у 'msgid' очікують кортеж, а специфікації у '%s' "
 "очікують відображення"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "у 'msgid' відсутні специфікації формату для аргументу '%s', як і у '%s'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "у 'msgid' та '%s' не збігаються специфікації формату для аргументу '%s'"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -736,11 +731,11 @@ msgid ""
 "1 and 9."
 msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -749,38 +744,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Автор програми %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Спробуйте `%s --help', щоб переглянути докладнішу інформацію.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР]\n"
@@ -816,29 +811,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адреси системи\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  вивести цю довідку та вийти\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               вивести інформацію про версію та вийти\n"
@@ -847,11 +842,11 @@ msgstr "  -V, --version               вивести інформацію про
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
 
@@ -860,30 +855,30 @@ msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu
 msgid "could not get host name"
 msgstr "не вдається отримати назву системи"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "допускається максимум один вхідний файл"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s та %s є взаємовиключними"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -892,33 +887,33 @@ msgstr ""
 "Фільтрує повідомлення каталогу перекладів у відповідності до їх атрибутів,\n"
 "та маніпулює цими атрибутами.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Розташування вхідного файлу:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний PO файл\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -926,32 +921,32 @@ msgstr ""
 "  -D, --directory=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів "
 "пошуку\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Якщо вхідний файл не вказаний, або якщо вказано -, використовується "
 "стандартний ввід.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Розташування файлу виводу:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -961,75 +956,75 @@ msgstr ""
 "записується\n"
 " у стандартний вивід.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Вибір повідомлень:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            зберегти перекладені, видалити неперекладені\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          зберегти неперекладені, видалити перекладені\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           видалити застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         зберегти застарілі #~ повідомлення\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Керування атрибутами:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             позначити всі повідомлення як 'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          позначити всі повідомлення застарілими\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        позначити всі повідомлення не застарілими\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1038,14 +1033,14 @@ msgstr ""
 "      --clear-previous        видалити \"previous msgid\" з усіх "
 "повідомлень\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ФАЙЛ.po     обробляти лише елементи перелічені у ФАЙЛ.po\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1053,36 +1048,36 @@ msgstr ""
 "      --ignore-file=ФАЙЛ.po   обробляти лише елементи не перелічені у ФАЙЛ."
 "po\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 синонім для --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              синонім для --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Синтаксис вхідного файлу:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      вхідний файл має синтаксис Java .properties\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1091,17 +1086,35 @@ msgstr ""
 "      --stringtable-input     вхідний файл має синтаксис NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробиці виводу:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1110,9 +1123,9 @@ msgstr ""
 "екранування\n"
 "                              мови C (типово)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1120,29 +1133,29 @@ msgstr ""
 "  -E, --escape                використовувати у виводі символи екранування\n"
 "                              мови C, без розширених символів\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              записувати PO файл, навіть порожній\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                записати .po файл вживаючи стиль з відступами\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           не записувати рядки '#: назва_файлу:рядок'\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1150,8 +1163,8 @@ msgstr ""
 "  -n, --add-location          створювати рядки '#: назва_файлу:"
 "рядок' (типово)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1159,32 +1172,32 @@ msgstr ""
 "      --strict                записувати .po файл точно відповідний "
 "Uniforum\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     записати файл Java .properties\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    записати файл NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          встановити ширину сторінки виводу\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1193,32 +1206,32 @@ msgstr ""
 "      --no-wrap               не розривати на декілька рядків довгі рядки\n"
 "                              повідомлень, що довші за ширину сторінки\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           сортувати вивід\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          сортувати вивід за розташуванням файлів\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "вказано неможливий критерій відбору (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1241,23 +1254,23 @@ msgstr ""
 "беруться з першого PO файлу, у якому вони були визначені. Коментарі з назвою\n"
 "файлу та номером рядка зберігаються для усіх PO файлів.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ ...            вхідні файли\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=ФАЙЛ       отримати перелік вхідних файлів з ФАЙЛ\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Якщо назвою вхідного файлу є -, використовується стандартний ввід.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1268,7 +1281,7 @@ msgstr ""
 "                              кількість разів, якщо значення не вказано,\n"
 "                              типове значення - нескінченість\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1279,7 +1292,7 @@ msgstr ""
 "                              кількість разів, якщо не вказано, типове\n"
 "                              значення дорівнює 0\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1288,16 +1301,16 @@ msgstr ""
 "  -u, --unique                скорочення для --less-than=2, вказує\n"
 "                              виводити лише унікальні повідомлення\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      вхідні файли мають синтаксис Java .properties\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1306,12 +1319,12 @@ msgstr ""
 "      --stringtable-input     вхідні файли мають синтаксис NeXTstep/GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=НАЗВА         кодування виводу\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1321,41 +1334,33 @@ msgstr ""
 "                              кожного повідомлення, не об'єднувати декілька\n"
 "                              перекладів\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "не вказані вхідні файли"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "потрібно рівно 2 вхідні файли"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Використання: %s [ПАРАМЕТР] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1372,22 +1377,22 @@ msgstr ""
 "у програмі. Якщо точну відповідність знайти не вдається, для покращення\n"
 "діагностики використовується приблизне порівняння.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      переклад\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     посилання на джерело\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Модифікатори режиму роботи:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1396,47 +1401,53 @@ msgstr ""
 "  -m, --multi-domain          застосувати ref.pot до кожного домену з def."
 "po\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+"  -N, --no-fuzzy-matching     не використовувати неточну відповідність\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             використовувати неточні записи\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      використовувати неперекладені записи\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "це повідомлення не перекладене"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "це повідомлення повинен перевірити перекладач"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "це повідомлення використовується програмою, але не було визначено..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...проте це визначення є подібним"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "це повідомлення використовується, але не було визначене у %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "попередження: це повідомлення не використовується"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1444,12 +1455,12 @@ msgstr[0] "знайдено %d критичну помилку"
 msgstr[1] "знайдено %d критичні помилки"
 msgstr[2] "знайдено %d критичних помилок"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необхідно вказати принаймні два файли"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1470,7 +1481,7 @@ msgstr ""
 "беруться з першого PO файлу, у якому вони були визначені. Коментарі з назвою\n"
 "файлу та номером рядка зберігаються для усіх PO файлів.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1480,7 +1491,7 @@ msgstr ""
 "                              кількістю визначень, якщо число не вказано,\n"
 "                              типове значення дорівнює 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1488,62 +1499,62 @@ msgstr ""
 "      --omit-header           не записувати заголовок у `msgid \"\"' "
 "елементі\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Перетворює каталог перекладів у інше кодування.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Результат перетворення:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Типовим кодуванням є кодування поточної локалі.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                стиль виводу з відступами\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           не виводити '#: filename:line' рядки\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          зберігати '#: filename:line' рядки (типово)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                стиль виводу Uniforum\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "не вказано вхідний файл"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "потрібен лише один вхідний файл"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Використання:  %s [ПАРАМЕТР] ВХІДНИЙ_ФАЙЛ\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1555,22 +1566,22 @@ msgstr ""
 "PO файл, або POT файл (зазвичай створений xgettext). Не перекладеним елементам\n"
 "призначається переклад, ідентичний до вмісту msgid.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний PO або POT файл\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "не вказана назва команди"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР] КОМАНДА [ПАРАМЕТРИ-КОМАНДИ]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1585,7 +1596,7 @@ msgstr ""
 "виводом msgexec. Програма msgexec повертає максимальний з кодів завершення усіх\n"
 "викликів команди.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1594,42 +1605,42 @@ msgstr ""
 "Спеціальна вбудована команда з назвою '0' виводить переклад, який завершується\n"
 "нульовим байтом. Вивід команди \"msgexec 0\" підходить як ввід команди \"xargs -0\".\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний PO файл\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "не вдається записати в стандартний вивід"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "не вдається записати у дочірній процес %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "не вказана назва фільтру"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "необхідно вказати принаймні один сценарій для sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Використання: %s [ПАРАМЕТР] ФІЛЬТР [ПАРАМЕТРИ-ФІЛЬТРУ]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Застосовує фільтр до всіх перекладів у каталозі.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1639,18 +1650,18 @@ msgstr ""
 "вводу\n"
 "та записує змінений переклад у стандартний вивід.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР є 'sed':\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=СЦЕНАРІЙ   додати СЦЕНАРІЙ до виконуваних команд\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1660,13 +1671,13 @@ msgstr ""
 "  -f, --file=ФАЙЛ_СЦЕНАРІЮ    додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних "
 "команд\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       не виводити автоматично шаблони\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1674,12 +1685,12 @@ msgstr ""
 "      --no-escape             вимкнути у виводі екранування у стилі C "
 "(типово)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                стиль виводу з відступами\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1687,69 +1698,50 @@ msgstr ""
 "      --keep-header           залишити заголовок незмінним, не фільтрувати "
 "його\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Ще не реалізовано."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "помилка зв'язку з дочірнім процесом %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "помилка читання з дочірнього процесу %s"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "дочірній процес %s завершився з кодом %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s повинен бути поодиноким знаком пунктуації"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправильно вказано порядок байтів: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s вимагає вказати параметр \"-d каталог\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s вимагає вказати параметр \"-l локаль\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s допускається лише з %s або %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допускається лише з %s, %s або %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1757,7 +1749,7 @@ msgstr[0] "%d перекладене повідомлення"
 msgstr[1] "%d перекладених повідомлення"
 msgstr[2] "%d перекладених повідомлень"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1765,7 +1757,7 @@ msgstr[0] ", %d неточний переклад"
 msgstr[1] ", %d неточних переклади"
 msgstr[2] ", %d неточних перекладів"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1773,17 +1765,17 @@ msgstr[0] ", %d неперекладене повідомлення"
 msgstr[1] ", %d неперекладених повідомлення"
 msgstr[2] ", %d неперекладених повідомлень"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Використання: %s [ПАРАМЕТР] назва_файлу.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створює двійковий каталог повідомлень з текстового опису.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1792,17 +1784,17 @@ msgstr ""
 "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 "Те ж саме й для необов'язкових аргументів.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  назва_файлу.po ...          вхідні файли\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим роботи:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1810,7 +1802,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  режим Java: створює Java ResourceBundle клас\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1819,12 +1811,12 @@ msgstr ""
 "      --java2                 як і --java, вважається Java2 (JDK 1.2 чи "
 "вище)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                режим C#: створює файли .NET .dll\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1833,56 +1825,56 @@ msgstr ""
 "      --csharp-resources      режим C# ресурсів: створює файл .NET ."
 "resources\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: створює файл Qt .qm\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                перейти у режим відповідності до Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Розташування вхідного файлу у режимі Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       назва ресурсу\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=ЛОКАЛЬ         назва локалі, або мова або мова_КРАЇНА\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d КАТАЛОГ                  базовий каталог ієрархії каталогів класів\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1894,12 +1886,12 @@ msgstr ""
 "після знаку підкреслення.  Параметр -d є обов'язковим.  Клас записується\n"
 "у вказаний каталог.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Розташування вхідного файлу у режимі C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1908,7 +1900,7 @@ msgstr ""
 "  -d КАТАЛОГ                  базовий каталог залежних від локалі .dll "
 "файлів\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1917,18 +1909,18 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .dll записується у підкаталог\n"
 "вказаного каталогу, назва якого залежить від локалі.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Розташування вхідного файлу у режимі Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d КАТАЛОГ                  базовий каталог каталогів .msg повідомлень\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1937,12 +1929,12 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .msg записується у вказаний "
 "каталог.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Інтерпретація вхідного файлу:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1953,13 +1945,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          перевірити залежний від мови формат рядків\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1968,7 +1960,7 @@ msgstr ""
 "      --check-header          перевірити наявність та вміст елементу "
 "заголовка\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1978,7 +1970,7 @@ msgstr ""
 "та\n"
 "                                параметром --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1987,7 +1979,7 @@ msgstr ""
 "  -C, --check-compatibility   перевірити, що GNU msgfmt поводиться як X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1998,12 +1990,12 @@ msgstr ""
 "у\n"
 "                                пунктах меню\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             виводити елементи неточного перекладу\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2011,87 +2003,87 @@ msgstr ""
 "  -a, --alignment=ЧИСЛО       форматувати рядки по ЧИСЛО байт у рядку "
 "(типово: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двійковий файл не буде включати хеш-таблицю\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            вивести статистику про переклад\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               збільшити рівень докладності виводу\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "попередження: заголовок PO файлу відсутній або некоректний\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "попередження: перетворення кодувань символів не працюватиме\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "попередження: заголовок PO файлу позначений як нечіткий переклад\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "попередження: старі версії msgfmt сприйматимуть це як помилку\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "назва домену \"%s\" не може використовуватись як назва файлу"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "назва домену \"%s\" не може використовуватись як назва файлу: буде "
 "використано префікс"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "директиву `domain %s' проігноровано"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "порожній елемент `msgstr' проігноровано"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "елемент з нечітким перекладом `msgstr' проігноровано"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "помилка при читанні \"%s\""
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2100,7 +2092,7 @@ msgstr ""
 "параметр '%c' не може використовуватись перед символами 'J', 'K', 'T', 'C' "
 "чи 'X'"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2109,7 +2101,7 @@ msgstr ""
 "Отримати усі повідомлення з каталогу перекладу, які відповідають вказаному\n"
 "шаблону або належать до певних вказаних вхідних файлів.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2184,7 +2176,7 @@ msgstr ""
 "  -v, --invert-match          виводити лише повідомлення, які не відповідають\n"
 "                              жодному критерію відбору\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2192,17 +2184,17 @@ msgstr ""
 "      --escape                використовувати у виводі екранування у стилі "
 "C, без розширених символів\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           сортувати інформацію, що виводиться\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          сортувати за розташуванням у файлах\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2212,7 +2204,7 @@ msgstr ""
 "змінну оточення LANG, як описано у файлі ABOUT-NLS. Це необхідно,\n"
 "щоб ви мали змогу перевірити ваш переклад.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2223,24 +2215,24 @@ msgstr ""
 "Вкажіть локаль у параметрі --locale, або вкажіть .po файл\n"
 "виводу у параметрі --output-file.\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створено %s.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "Створює новий PO файл, мета-інформація ініціалізується з оточення користувача.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний POT файл\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2250,12 +2242,12 @@ msgstr ""
 "Якщо не вказано вхідний файл, POT файл шукається у поточному каталозі.\n"
 "Якщо вказано -, файл читається зі стандартного вводу.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=ФАЙЛ      записати вивід у вказаний файл PO\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2265,19 +2257,19 @@ msgstr ""
 "локалі\n"
 "користувача. Якщо вказано знак -, результат виводиться у стандартний вивід.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          встановити цільову локаль\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         вважати, що PO файл створений автоматично\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2285,12 +2277,12 @@ msgstr ""
 "Знайдено більш ніж один .pot файл.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "помилка при читанні поточного каталогу"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2298,14 +2290,14 @@ msgstr ""
 "Не знайдено .pot файл у поточному каталозі.\n"
 "Вкажіть вхідний .pot файл у параметрі --input.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "процес-нащадок %s завершився аварійно з кодом %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2322,28 +2314,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Переклад українською для пакету %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "вказане кодування \"%s\" не є переносною назвою кодування"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "у вхідному файлі два різні кодування \"%s\" та \"%s\""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл `%s' не містить елемент заголовка, який вказує кодування"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2352,19 +2344,19 @@ msgstr ""
 "домен \"%s\" у вхідному файлі `%s' не містить елемент заголовку, який вказує "
 "кодування"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "цільове кодування \"%s\" не є переносною назвою кодування."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "попередження: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2373,7 +2365,7 @@ msgstr ""
 "Вхідні файли містять повідомлення у інших кодуваннях, UTF-8 поміж інших.\n"
 "Вивід перетворюється у UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2385,7 +2377,7 @@ msgstr ""
 "Вивід перетворюється у UTF-8.\n"
 "Щоб вибрати інше кодування виводу, використовуйте параметр --to-code.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2399,7 +2391,7 @@ msgstr ""
 "що\n"
 "вони вже у кодуванні UTF-8, тобто у файлах з текстом програми.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2412,12 +2404,12 @@ msgstr ""
 "Вивід '%s' може бути некоректним.\n"
 "Можливі обхідні шляхи:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Встановити LC_ALL у значення локалі з кодуванням %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2428,7 +2420,7 @@ msgstr ""
 "  потім застосувати '%s',\n"
 "  потім перетворити назад на %s використовуючи 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2441,7 +2433,7 @@ msgstr ""
 "  потім застосувати '%s',\n"
 "  потім перетворити назад у %s використовуючи 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2452,27 +2444,27 @@ msgstr ""
 "Вивід '%s' може бути некоректним.\n"
 "Можливим обхідним шляхом є встановлення LC_ALL=C.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "розширення множинних форм можуть давати від'ємні значення"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, але розширення множинних форм можуть давати значення такі ж "
 "великі як і %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "розширення множинних форм можуть призводити до ділення на нуль"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 "розширення множинних форм можуть призводити до переповнення цілого значення"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2480,37 +2472,37 @@ msgstr ""
 "розширення множинних форм можуть призводити до арифметичних виключних "
 "ситуацій, можливе ділення на нуль"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Спробуйте використати наступне, що є правильним для %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "каталог повідомлень має переклади з множинними формами"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "але заголовок не містить атрибут \"plural=ВИРАЗ\""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "але заголовок не містить атрибут \"nplurals=ЦІЛЕ_ЧИСЛО\""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "неправильне значення nplurals"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "неправильне значення plural"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2518,7 +2510,7 @@ msgstr[0] "але деякі повідомлення мають лише %lu м
 msgstr[1] "але деякі повідомлення мають лише %lu множинні форми"
 msgstr[2] "але деякі повідомлення мають лише %lu множинних форм"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2526,7 +2518,7 @@ msgstr[0] "але деякі повідомлення мають %lu множи
 msgstr[1] "але деякі повідомлення мають %lu множинні форми"
 msgstr[2] "але деякі повідомлення мають %lu множинних форм"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2534,83 +2526,83 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами, але заголовок не "
 "містить \"Plural-Forms: nplurals=ЦІЛЕ; plural=ВИРАЗ;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "обидва елементи `msgid' та `msgid_plural' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "обидва елементи `msgid' та `msgstr[%u]' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "елементи `msgid' та `msgstr' не починаються одночасно з '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "елементи `msgid' та `msgid_plural' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "елементи `msgid' та `msgstr[%u]' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "елементи `msgid' та `msgstr' не закінчуються одночасно на '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "обробка множинних форм є розширенням GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "у msgstr відсутній символ клавішного акселератора '%c'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr містить надто багато символів клавішних акселераторів '%c'"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "у заголовку відсутнє поле `%s'\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "поле заголовку `%s' повинно починатись с початку рядка\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "деякі поля заголовків досі мають початкові типові значення\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "поле `%s' доÑ\81Ñ\96 маÑ\94 поÑ\87аÑ\82кове Ñ\82ипове значення\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "деÑ\8fкÑ\96 полÑ\8f заголовкÑ\96в доÑ\81Ñ\96 маÑ\8eÑ\82Ñ\8c поÑ\87аÑ\82ковÑ\96 Ñ\82иповÑ\96 значення\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: вхідний потік не є коректним для кодування \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: помилка при перетворенні кодування з \"%s\" на \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл не містить заголовок, що вказує кодування"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2619,7 +2611,7 @@ msgstr ""
 "Не вдається перетворити з \"%s\" на \"%s\". %s використовує iconv(), а iconv"
 "() не підтримує це перетворення."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2628,8 +2620,8 @@ msgstr ""
 "Перетворення з \"%s\" у \"%s\" призводить до появи дублікатів: деякі msgid "
 "ключі стануть однаковими."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2638,16 +2630,16 @@ msgstr ""
 "Не вдається перетворити з \"%s\" у \"%s\". %s використовує iconv(). Ця "
 "версія скомпільована без iconv()."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s є допустимим лише разом з %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "тип резервної копії"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2670,17 +2662,17 @@ msgstr ""
 "у файл будуть збережені.  Якщо неможливо знайти точну відповідність,\n"
 "для отримання кращого результату використовується неточна відповідність.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      переклади з посиланнями на старий код\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     посилання на новий код\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2689,7 +2681,7 @@ msgstr ""
 "  -C, --compendium=ФАЙЛ       додаткова бібліотека перекладів повідомлень,\n"
 "                              може бути вказано більш ніж один раз\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2698,29 +2690,29 @@ msgstr ""
 "  -U, --update                оновити def.po,\n"
 "                              нічого не робить, якщо def.po вже оновлений\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Розташування файлу виводу у режимі оновлення:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Результат записується назад у def.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=КОНТРОЛЬ       зробити резервну копію def.po\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=СУФІКС         перевизначити звичайний суфікс резервної "
 "копії\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2739,7 +2731,7 @@ msgstr ""
 "прості\n"
 "  simple, never   завжди використовувати прості резервні копії\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2750,13 +2742,7 @@ msgstr ""
 "suffix\n"
 "або змінною значення SIMPLE_BACKUP_SUFFIX.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching     не використовувати неточну відповідність\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2764,22 +2750,22 @@ msgstr ""
 "      --previous              зберегти попередні msgid перекладених "
 "повідомлень\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       не виводити індикатор поступу\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "це повідомлення повинно визначати множинні форми"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "це повідомлення не повинно визначати множинні форми"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2788,26 +2774,28 @@ msgstr ""
 "%sПрочитано %ld старих + %ld посилань, об'єднано %ld, неточних %ld, "
 "відсутніх %ld, застарілих %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " виконано.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s та явне вказування назв файлів виключають одне одного"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Використання: %s [ПАРАМЕТР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Перетворює двійковий каталог повідомлень у .po файл Uniforum стилю.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2815,13 +2803,13 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java режим: вхід є класом Java ResourceBundle\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# режим: вхідний файл у форматі .NET .dll\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2830,7 +2818,7 @@ msgstr ""
 "      --csharp-resources      режим C# ресурсів: вхідний файл у форматі ."
 "NET .resources\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
@@ -2838,17 +2826,17 @@ msgstr ""
 "      --tcl                   Tcl режим: вхідний файл у форматі tcl/msgcat ."
 "msg\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  ФАЙЛ ...                    вхідні файли .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Розташування вхідних файлів у Java режимі:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2859,12 +2847,12 @@ msgstr ""
 "відокремлюється символом підкреслення. Клас шукається з використанням "
 "CLASSPATH.\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Розташування вхідного файлу у C# режимі:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2873,12 +2861,12 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .dll шукається у підкаталозі\n"
 "вказаного каталогу, назва якого залежить від локалі.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Розташування вхідного файлу у Tcl режимі:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2887,19 +2875,19 @@ msgstr ""
 "Параметри -l та -d є обов'язковими.  Файл .msg шукається у вказаному\n"
 "каталозі.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 "  -i, --indent                використовувати стиль виводу з відступами\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                виводити у точній відповідності до uniforum\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2920,12 +2908,12 @@ msgstr ""
 "параметр --use-first, вони беруться від першого перекладу.  Позиції у файлах\n"
 "будуть зібрані до купи.  При використанні --unique, дублікати відкидаються.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              виводити лише дублікати\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2934,7 +2922,7 @@ msgstr ""
 "  -u, --unique                виводити лише унікальні повідомлення, без "
 "дублікатів\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -3021,65 +3009,65 @@ msgstr "перша множинна форма має ненульовий ін
 msgid "plural form has wrong index"
 msgstr "множинна форма має неправильний індекс"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "надто багато помилок, виконання перервано"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "неправильна мультибайтна послідовність"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "незавершена мультибайтна послідовність наприкінці файлу"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "незавершена мультибайтна послідовність наприкінці рядка"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "помилка при iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невідоме ключове слово \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "неправильна керуюча послідовність"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "кінець файлу посеред рядка"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "кінець рядка посеред рядка"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "розділювач контексту <EOT> посеред рядка"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "цей файл не може містити доменних директив"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "дублікат визначення повідомлення"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "це місце першого визначення"
 
@@ -3164,17 +3152,17 @@ msgstr "вхідний потік не є коректним для кодува
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "помилка при перетворення з кодування \"%s\" на \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "очікувалось два аргументи"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Використання : %s [ПАРАМЕТР] URL ФАЙЛ\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3183,11 +3171,26 @@ msgstr ""
 "Витягує та виводить вміст URL.  Якщо URL недоступний,\n"
 "натомість використовується локально доступний ФАЙЛ.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "помилка при записі у стандартний вивід"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3230,42 +3233,42 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами, але формат виводу їх "
 "не підтримує."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "не вдається створити файл виводу \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "стандартний вивід"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "не вдається створити каталог \"%s\""
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "помилка при компіляції класу C#, спробуйте --verbose"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "не є правильною назвою класу Java: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3276,7 +3279,7 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "помилка при відкриванні \"%s\" для запису"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3284,7 +3287,7 @@ msgstr ""
 "інтернаціоналізовані повідомлення не повинні містити `\\%c' escape-"
 "послідовність"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3297,7 +3300,7 @@ msgstr ""
 "вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3320,13 +3323,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"каталог повідомлень має msgctxt рядки з символи за межами кодування ISO-8859-"
-"1\n"
+"каталог повідомлень має msgctxt рядки з символи за межами кодування "
+"ISO-8859-1\n"
 "але формат каталогу повідомлень Qt підтримує Юнікод лише у полях "
 "перекладених\n"
 "рядків, а не у рядках контексту\n"
@@ -3337,8 +3340,8 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"каталог повідомлень має msgid рядки з символи за межами кодування ISO-8859-"
-"1\n"
+"каталог повідомлень має msgid рядки з символи за межами кодування "
+"ISO-8859-1\n"
 "але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених "
 "рядках\n"
 
@@ -3347,7 +3350,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "помилка при записі у \"%s\" дочірній процес"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3355,7 +3358,7 @@ msgstr ""
 "каталог повідомлень містить залежний від контексту переклад\n"
 "але формат каталогу ресурсів C# не підтримує контексти\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3379,36 +3382,34 @@ msgstr ""
 "каталог повідомлень містить переклад з множинними формами\n"
 "але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: попередження: незавершений рядок"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: попередження: незавершений регулярний вираз"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: попередження: незавершений символьний літерал"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Не-ASCII рядок у %s%s.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3417,7 +3418,7 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3426,7 +3427,7 @@ msgstr ""
 "%s:%d: Довга незавершена мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3435,7 +3436,7 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці файлу.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3444,12 +3445,12 @@ msgstr ""
 "%s:%d: Незавершена мультибайтова послідовність наприкінці рядка.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: помилка iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3458,32 +3459,32 @@ msgstr ""
 "%s:%d: Неправильна мультибайтова послідовність.\n"
 "Вкажіть вхідне кодування у параметрі --from-code.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: попередження: неправильний символ Юнікоду"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: попередження: незавершена символьна константа"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: попередження: знайдено ')' там де очікувалась '}'"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: попередження: знайдено '}' там де очікувалась ')'"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3492,50 +3493,49 @@ msgstr ""
 "Мова \"glade\" не підтримується. %s залежить від expat.\n"
 "Ця версія скомпільована без підтримки expat.\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: попередження: незавершений рядок"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: не вдається знайти символ завершення рядка \"%s\" до EOF"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: відсутня права фігурна дужка у \\x{ШІСТН.ЧИСЛО}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\l\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\u\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: неправильна інтерполяція змінної у \"%c\""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\L\") 8-бітного символу \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерполяція (\"\\U\") 8-бітного символу \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
@@ -3543,7 +3543,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3554,7 +3554,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3565,7 +3565,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3576,7 +3576,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3587,7 +3587,7 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3598,27 +3598,27 @@ msgstr ""
 "Вкажіть вхідне кодування у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Невідоме кодування \"%s\". Вважається кодування ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправильне визначення рядка"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: після знаку # відсутнє число"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправильний символьний вираз"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3627,30 +3627,30 @@ msgstr ""
 "%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; "
 "натомість використовуйте eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може використовуватись, якщо вивід направляється у "
 "стандартний вивід"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може працювати без вказаних ключових слів для пошуку"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "попередження: у файлі `%s' невідоме розширення `%s'; спроба використати C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Витягує рядки для перекладу з вказаних вхідних файлів.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3659,12 +3659,12 @@ msgstr ""
 "  -d, --default-domain=НАЗВА  виводити у файл НАЗВА.po (замість messages."
 "po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ФАЙЛ           записувати вивід у вказаний файл\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3672,12 +3672,12 @@ msgstr ""
 "  -p, --output-dir=КАТАЛОГ    файли виводу будуть створені у каталозі "
 "КАТАЛОГ\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Вибір мови вхідного файлу:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3696,19 +3696,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   скорочення для --language=C++\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Типово, мова визначається за розширенням назви вхідного файлу.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3717,44 +3717,47 @@ msgstr ""
 "      --from-code=НАЗВА       кодування для вхідних файлів\n"
 "                                (за винятком Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Типово, вважається, що вхідні файли у кодуванні ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         об'єднати повідомлення з існуючим файлом\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=ФАЙЛ.po  елементи з ФАЙЛ.po не будуть витягуватись\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:879
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=ТЕГ]    вставляє блок коментарів з ТЕГ (або тих, що\n"
 "                              передують рядкам ключового слова) у файл "
 "виводу\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметри особливі для мови:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           витягнути усі рядки\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3767,18 +3770,18 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=СЛОВО]       додаткове ключове слово, яке буде "
 "відшукуватись\n"
 "                              (вживання СЛОВО не означає невикористання\n"
 "                               типових ключових слів)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3788,7 +3791,7 @@ msgstr ""
 "      --flag=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
 "                              аргументу АРГ ключового слова СЛОВО\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3801,55 +3804,55 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (лише мови C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (лише мова C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    розпізнавати рядки у Qt форматі\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 розпізнавати рядки у форматі Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 докладніший результат пошуку рядків формату\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     виводити у файл Java .properties\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3857,17 +3860,17 @@ msgstr ""
 "      --foreign-user          пропускати у виводі FSF copyright для "
 "сторонніх користувачів\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=РЯДОК  встановити власника авторських прав\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3875,43 +3878,60 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у "
 "msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:973
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=РЯДОК]   вживати РЯДОК або \"\" як префікс елементів "
 "msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:976
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=РЯДОК]   вживати РЯДОК або \"\" як суфікс елементів "
 "msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:[pass-]"
 "<flag>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "стандартний ввід"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: попередження: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3920,16 +3940,16 @@ msgstr ""
 "Хоча й використовується у позиції рядку формату, %s не є правильним %s "
 "рядком формату. Причина: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
-"Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: %"
-"s\n"
+"Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: "
+"%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3942,7 +3962,7 @@ msgstr ""
 "Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
 "що мають назву та їх підстановку.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3952,29 +3972,29 @@ msgstr ""
 "gettext(\"\") повертає елемент заголовку\n"
 "метаінформації, а не порожній рядок.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неоднозначно вказане ключове слово '%.*s'"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
-"попередження: відсутній контекст для множинного аргументу ключового слова '%."
-"*s'"
+"попередження: відсутній контекст для множинного аргументу ключового слова "
+"'%.*s'"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "невідповідність контексту між формою однини та множини"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3986,7 +4006,7 @@ msgstr ""
 "тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
 "вкажіть --msgid-bugs-address аргумент командного рядка.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "невідома мова `%s'"
@@ -3995,6 +4015,32 @@ msgstr "невідома мова `%s'"
 msgid "<unnamed>"
 msgstr "<без назви>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неправильний параметр -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "аварійне завершення DuplicateHandle з кодом помилки 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Ще не реалізовано."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr ""
+#~ "не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу "
+#~ "%s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "помилка зв'язку з дочірнім процесом %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "помилка читання з дочірнього процесу %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "дочірній процес %s завершився з кодом %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' досі має початкове типове значення\n"
+
 #~ msgid "Multiple references to %%%c."
 #~ msgstr "Множинні посилання на %%%c."
 

diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index 02254c382348299f52c75ecbc8d7ea033e5217c7..9d4fabf0a74b2dfd3d95e778f7952632d43412b9 100644 (file)
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-09-24 22:40+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -33,22 +33,22 @@ msgstr "đối số mơ hồ « %s » cho « %s »"
 msgid "Valid arguments are:"
 msgstr "Đối số hợp lệ:"
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "không tìm thấy thư mục tạm thời, hãy thử đặt $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "không thể tạo thư mục tạm thời bằng biểu mẫu « %s »"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "không thể gỡ bỏ tập tin tạm thời %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "không thể gỡ bỏ thư mục tạm thời %s"
@@ -57,10 +57,10 @@ msgstr "không thể gỡ bỏ thư mục tạm thời %s"
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "gặp lỗi khi mở « %s » để đọc"
@@ -86,8 +86,8 @@ msgstr "gặp lỗi khi ghi « %s »"
 msgid "error after reading \"%s\""
 msgstr "gặp lỗi sau khi đọc « %s »"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,74 +104,73 @@ msgstr "Không tìm thấy trình biên dịch C#, hãy thử cài đặt pnet."
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Không tìm thấy cơ chế ảo C#, hãy thử cài đặt pnet."
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Tiến trình con « %s » bị lỗi"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, 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:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, 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:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần phải có đối số\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: không nhận diện tùy chọn « --%s »\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: không nhận diện tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: không cho phép tùy chọn « -- %c »\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, 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:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tùy chọn cần thiết đối số « -- %c »\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, 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:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tùy chọn « %s » cần phải có đối số\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -187,14 +186,14 @@ msgstr ""
 "đối số « target_version » (phiên bản đích) không hợp lệ đối với « "
 "compile_java_class » (biên dịch hạng Java)"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "lỗi tạo « %s »"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -211,8 +210,8 @@ msgstr ""
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Không tìm thấy cơ chế ảo Java, hãy thử cài đặt gcj hoặc đặt $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s lỗi VR tiến trình con"
@@ -224,8 +223,8 @@ msgstr "%s lỗi VR tiến trình con"
 msgid "memory exhausted"
 msgstr "hết bộ nhớ rồi"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "không thể tạo ống dẫn"
@@ -287,7 +286,7 @@ msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -298,7 +297,7 @@ msgstr ""
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -306,7 +305,7 @@ msgstr "một đặc tả định dạng cho đối số %u, không tồn tại
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -736,11 +735,11 @@ msgid ""
 "1 and 9."
 msgstr "Ký tự kết thúc chỉ thị số %u không phải chữ số nằm giữa 1 và 9."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -753,39 +752,39 @@ msgstr ""
 "Đây là phần mềm tự do : bạn có quyền thay đổi và phát hành lại nó.\n"
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Tác giả: %s.\n"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "quá nhiều đối số"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Hãy thử lệnh « %s --help » để xem thông tin thêm.\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Cách sử dụng: %s [TÙY CHỌN]\n"
@@ -820,29 +819,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            các _địa chỉ_ cho tên máy đó\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  hiện _trợ giúp_ này rồi thoát\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               xuất thông tin _phiên bản_ rồi thoát\n"
@@ -851,11 +850,11 @@ msgstr "  -V, --version               xuất thông tin _phiên bản_ rồi tho
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
 
@@ -864,30 +863,30 @@ msgstr "Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "không thể lấy tên máy"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cho phép nhiều nhất một tập tin nhập"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s và %s loại từ lẫn nhau"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN_NHẬP]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -896,10 +895,10 @@ msgstr ""
 "Lọc các thông điệp của phân loại thông dịch tùy theo thuộc tính,\n"
 "cũng thao tác thuộc tính.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -907,23 +906,23 @@ msgstr ""
 "Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy "
 "chọn ngắn.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Vị trí tập tin nhập:\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  TẬP_TIN_NHẬP              tập tin PO nhập vào\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -931,32 +930,32 @@ msgstr ""
 "  -D, --directory=THƯ_MỤC\n"
 "\tthêm _thư mục_ này vào danh sách để tìm kiếm tập tin nhập\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Không đưa ra tập tin nhập, hay nó là « - » thì thiết bị nhập chuẩn được "
 "đọc.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Vị trí tấp tin xuất:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=TẬP_TIN     ghi kết _xuất_ vào _tập tin_ này\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -966,12 +965,12 @@ msgstr ""
 "ra,\n"
 "hoặc nếu nó là « ~ ».\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Chọn thông điệp:\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -979,7 +978,7 @@ msgstr ""
 "      --translated\n"
 "\tgiữ các thông điệp _đã dịch_, gỡ bỏ các điều chưa dịch\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -987,62 +986,62 @@ msgstr ""
 "      --untranslated\n"
 "\tgiữ các thông điệp _chưa dịch_, gỡ bỏ các điều đã dịch\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy       gỡ bỏ các thông điệp có nhãn « mờ » (_không mờ_)\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            giữ các thông điệp có nhãn « mờ » (_chỉ mờ_)\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 "      --no-obsolete           gỡ bỏ các thông điệp quá cũ [có dấu #~] "
 "(_không cũ_)\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         giữ các thông điệp quá cũ [có dấu #~] (_chỉ "
 "cũ_)\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Thao tác thuộc tính:\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             đặt mọi thông điệp là « mờ » (_đặt mờ_)\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy          đặt mọi thông điệp là khác « mờ » (_xóa mờ_)\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          đặt mọi thông điệp là quá cũ (_đặt cũ_)\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        đặt mọi thông điệp là khác cũ (_xóa cũ_)\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1051,7 +1050,7 @@ msgstr ""
 "      --clear-previous        gỡ bỏ « msgid trước » ra mọi thông điệp (_xoá "
 "trước_)\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1059,7 +1058,7 @@ msgstr ""
 "      --only-file=TẬP_TIN.po\n"
 "\tthao tác chỉ những mục được liệt kê trong tập tin này (_chỉ tập tin_)\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1068,28 +1067,28 @@ msgstr ""
 "\tthao tác chỉ những mục không được liệt kê trong tập tin này\n"
 "\t(_bỏ qua tập tin_)\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 bằng --only-fuzzy hay --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              bằng --only-obsolete hay --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Cú pháp tập tin nhập:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1097,8 +1096,8 @@ msgstr ""
 "  -P, --properties-input\n"
 "\ttập tin nhập có cú pháp .properties (tài sản) của Java (_tài sản_)\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1108,17 +1107,43 @@ msgstr ""
 "\ttập tin nhập có cú phãp .strings kiểu NeXTstep/GNUstep\n"
 "\t{_bảng chuỗi-nhập_)\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Chi tiết xuất:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color\t\t\tluôn luôn đặt màu sắc và các thuộc tính văn bản khác\n"
+"      --color=KHI\t\tđặt màu sắc và các thuộc tính văn bản khác KHI nào :\n"
+"\t• always\t\tluôn luôn\n"
+"\t• never\t\tkhông bao giờ\n"
+"\t• auto\t\ttự động\n"
+"\t• html\t\tHTML.\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+"      --style=TẬP_TIN       ghi rõ tập tin quy tắc kiểu dáng CSS cho --color "
+"(màu)\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1126,9 +1151,9 @@ msgstr ""
 "  -e, --no-escape\n"
 "\tkhông dùng ký tự thoát C trong kết xuất [mặc định] (_không thoát_)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1136,24 +1161,24 @@ msgstr ""
 "  -E, --escape\n"
 "\tdùng ký tự thoát C trong kết xuất, không có ký tự đã mở rộng (_thoát_)\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po     ghi ra tập tin PO thậm chí nếu nó rỗng (_buộc PO_)\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                ghi ra tập tin PO bằng kiểu dáng thụt lề "
 "(_thụt lề_)\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
@@ -1161,8 +1186,8 @@ msgstr ""
 "\tkhông ghi dòng kiểu « #: tên_tập_tin:số_hiệu_dòng »\n"
 "\t(_không vị trí_)\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1171,8 +1196,8 @@ msgstr ""
 "\ttạo ra dòng kiểu « #: tên_tập_tin:số_hiệu_dòng » [mặc định]\n"
 "\t(_thêm vị trí_)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1180,18 +1205,18 @@ msgstr ""
 "      --strict         xuất tập tin PO tùy theo Uniforum chính xác\n"
 "\t(_chặt chẽ_)\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "\txuất tập tin .properties (tài sản) kiểu Java (_tài sản-xuất_)\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1200,16 +1225,16 @@ msgstr ""
 "\txuất tập tin .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 "\t(_bảng chuỗi-xuất_)\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SỐ          đặt độ rộng của trang xuất (_độ rộng_)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1218,30 +1243,30 @@ msgstr ""
 "      --no-wrap\t\t_hông ngắt ra nhiều dòng, dòng thông điệp\n"
 "dài hơn độ rộng của trang xuất (_không ngắt_)\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 "  -s, --sort-output           tạo ra kết xuất đã sắp xếp\n"
 "\t(_sắp xếp kết xuất)\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sắp xếp kết xuất theo vị trí tập tin\n"
 "\t(_sắp xếp theo tập tin_)\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "tiêu chuẩn lựa chọn không thể được xác định (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN_NHẬP]...\n"
@@ -1271,25 +1296,25 @@ msgstr ""
 "chúng sẽ được lấy từ tập tin PO thứ nhất có định nghĩa chúng.\n"
 "Vị trí tập tin từ mọi tập tin PO sẽ được lũy tích.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  TẬP_TIN_NHẬP ...           những tập tin nhập\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=TẬP_TIN\n"
 "\tlấy danh sách các tập tin nhập từ tập tin này (_tập tin từ_)\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Tập tin nhập là « - » thì thiết bị nhập chuẩn được đọc.\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1309,7 +1334,7 @@ msgstr ""
 "\tin ra các thông điệp có nhiều hơn SỐ lời định nghĩa;\n"
 "\tkhông đặt thì mặc định là 0 (_nhiều hơn_)\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1318,8 +1343,8 @@ msgstr ""
 "  -u, --unique  \ttốc ký cho tùy chọn « --less-than=2 » (ít hơn 2),\n"
 "\tyêu cầu chỉ những thông điệp duy nhất được in (_duy nhất_)\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1328,8 +1353,8 @@ msgstr ""
 "\ttập tin nhập có cú pháp kiểu .properties (tài sản) của Java\n"
 "\t(_tài sản-nhập_)\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1339,12 +1364,12 @@ msgstr ""
 "\ttập tin nhập có cú pháp .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 "\t(_bảng chuỗi-nhập_)\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=MÃ          \tbộ ký tự cho kết xuất (_đến mã_)\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1353,51 +1378,29 @@ msgstr ""
 "      --use-first\tdùng bản dịch sẵn sàng thứ nhất cho mỗi thông điệp,\n"
 "\tkhông trộn nhiều bản dịch (_dùng thứ nhất_)\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color\t\t\tluôn luôn đặt màu sắc và các thuộc tính văn bản khác\n"
-"      --color=KHI\t\tđặt màu sắc và các thuộc tính văn bản khác KHI nào :\n"
-"\t• always\t\tluôn luôn\n"
-"\t• never\t\tkhông bao giờ\n"
-"\t• auto\t\ttự động\n"
-"\t• html\t\tHTML.\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=TẬP_TIN       ghi rõ tập tin quy tắc kiểu dáng CSS cho --color "
-"(màu)\n"
-
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "chưa đưa ra tập tin nhập"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cần thiết chính xác 2 tập tin nhập"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
@@ -1430,12 +1433,12 @@ msgstr "  cũ.po                      chuỗi đã dịch\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  mới.pot                   tham chiếu đến nguồn\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Sửa đổi thao tác:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1445,7 +1448,7 @@ msgstr ""
 "\táp dụng tập tin mới.pot vào mỗi miền nằm trong tập tin cũ.po\n"
 "\t(_đa miền_)\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1474,17 +1477,17 @@ msgstr "thông điệp này chưa được dùng"
 msgid "this message needs to be reviewed by the translator"
 msgstr "thông điệp này cần phải được xem lại bởi dịch giả"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "thông điệp này được dùng còn chưa được xác định..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...nhưng mà lời xác định này là tương tự"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "thông điệp này được dùng còn chưa được xác định trong %s"
@@ -1500,12 +1503,12 @@ msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "tìm thấy %d lỗi nghiêm trọng"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "phải xác định ít nhất hai tập tin"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1526,7 +1529,7 @@ msgstr ""
 "trích sẽ được bảo tồn, nhưng chỉ từ tập tin PO thứ nhất đã xác định chúng.\n"
 "Vị trí tập tin từ mọi tập tin PO sẽ được tích lũy.\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1536,7 +1539,7 @@ msgstr ""
 "\tin các thông điệp chứa nhiều lời xác định hơn số này;\n"
 "\tmặc định là 1 nếu không được đặt (_nhiều hơn_)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1544,36 +1547,36 @@ msgstr ""
 "      --omit-header\n"
 "\tkhông ghi phần đầu có mục `msgid \"\"' (_bỏ sót phần đầu_)\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Chuyển đổi phân loại thông dịch sang mã ký tự khac.\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Đích chuyển đổi:\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Mã ký tự mặc định theo mã ký tự của miền địa phương hiện có.\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kiểu dáng xuất đã thụt lề (_thụt lề_)\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location\n"
 "\tthu hồi dòng kiểu « #: tên_tập_tin:số_dòng » (_không vị trí_)\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1581,30 +1584,30 @@ msgstr ""
 "      --add-location\n"
 "\tbảo quản dòng kiểu « #: tên_tập_tin:số_dòng » (_thêm vị trí_)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                xuất dữ liệu kiểu Uniforum chính xác\n"
 "\t(_chặt chẽ_)\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "chưa đưa ra tập tin nhập vào"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "cần thiết chính xác một tập tin nhập vào"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] TẬP_TIN_NHẬP\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1617,7 +1620,7 @@ msgstr ""
 "(POT: thường do xgettext tạo). Mục nhập chưa dịch được gán\n"
 "bản dịch trùng với chuỗi gốc (msgid).\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  TẬP_TIN_NHẬP               tập tin dạng .po hay .pot nhập vào\n"
@@ -1657,7 +1660,7 @@ msgstr ""
 "với một byte vô giá trị theo sau. Kết xuất của tiến trình msgexec\n"
 "là thích hợp là kết nhập vào « xargs -0 ».\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
@@ -1674,27 +1677,27 @@ msgstr "lỗi ghi vào thiết bị xuất chuẩn"
 msgid "write to %s subprocess failed"
 msgstr "lỗi ghi vào tiến trình phụ %s"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "thiếu tên bộ lọc"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "phải xác định ít nhất một văn lệnh sed"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Áp dụng bộ lọc vào mọi chuỗi dịch của phân loại thông dịch.\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1703,12 +1706,12 @@ msgstr ""
 "BỘ LỌC là bất cứ chương trình nào đọc chuỗi dịch từ thiết bị nhập chuẩn\n"
 "và ghi chuỗi dịch đã sửa đổi vào thiết bị xuất chuẩn.\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Tùy chọn lọc hữu ích khi BỘ LỌC là « sed »:\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1716,7 +1719,7 @@ msgstr ""
 "  -e, --expression=VĂN_LỆNH\n"
 "\tthêm văn lệnh này vào những lệnh cần thực hiện (_biểu thức_)\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1727,14 +1730,14 @@ msgstr ""
 "\tthêm nội dung của tập tin văn lệnh này vào những lệnh cần thực hiện\n"
 "\t(_tập tin văn lệnh_)\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       thu hồi khả năng tự động in miền mẫu (_im_)\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1743,12 +1746,12 @@ msgstr ""
 "\tkhông dùng ký tự thoát C trong kết xuất [mặc định]\n"
 "\t(_không thoát_)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                kiểu dáng xuất đã thụt lề (_thụt lề_)\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1768,22 +1771,22 @@ msgstr "tình trạng cuối không hợp lệ: %s"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s cần thiết đặc tả « -d directory » (thư mục)"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s cần thiết đặc tả « -l locale » (miền địa phương)"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s chỉ hợp lệ với %s hay %s"
@@ -1829,7 +1832,7 @@ msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Tạo ra phân loại thông điệp nhị phân từ mô tả thông dịch kiểu văn bản.\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1843,7 +1846,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  tên_tập_tin.po ...         những tập tin nhập vào\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
@@ -1899,7 +1902,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                bật chế độ Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Tập tin xuất là - thì kết xuất được ghi vào thiết bị xuất chuẩn.\n"
@@ -1909,13 +1912,13 @@ msgstr "Tập tin xuất là - thì kết xuất được ghi vào thiết bị
 msgid "Output file location in Java mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Java:\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=TÀI_SẢN     tên tài sản (_tài sản_)\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1948,7 +1951,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1972,7 +1975,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
@@ -1988,7 +1991,7 @@ msgstr ""
 "Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
 "Tập tin dạng .msg được ghi trong thư mục đã xác định.\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Giải thích tập tin nhập vào:\n"
@@ -2081,7 +2084,7 @@ msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            in ra thống kê về các chuỗi dịch (_thống kê_)\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               tăng cấp xuất thông tin (_chi tiết_)\n"
@@ -2137,7 +2140,7 @@ msgstr "mục nhập « msgstr » mờ bị bỏ qua"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: cảnh báo : tập tin nguồn chứa chuỗi dịch mờ"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -2148,7 +2151,7 @@ msgstr "%s: cảnh báo : tập tin nguồn chứa chuỗi dịch mờ"
 msgid "error while reading \"%s\""
 msgstr "gặp lỗi khi đọc « %s »"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2157,7 +2160,7 @@ msgstr ""
 "tùy chọn « %c » không thể được dùng trước khi xác định « J » hay « K » hay « "
 "T » hay « C » hay « X »"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2166,7 +2169,7 @@ msgstr ""
 "Trích ra mọi thông điệp trong phân loại thông dịch tương ứng với mẫu đã cho\n"
 "hay thuộc về một số tập tin nguồn đã cho.\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2255,7 +2258,7 @@ msgstr ""
 "\txuất chỉ những thông điệp không khớp với tiêu chuẩn lựa chọn nào\n"
 "\t(_đảo ngược sự khớp_)\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2264,21 +2267,21 @@ msgstr ""
 "\tdùng ký tự thoá_ dạng C trong kết xuất,\n"
 "\tkhông có ký tự đã mở rộng (_thoát_)\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 "      --sort-output           tạo ra kết xuất đã sắp xếp\n"
 "\t(_sắp xếp kết xuất_)\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 "      --sort-by-file\tsắp xếp dữ liệu xuất theo vị trí của tập tin\n"
 "\t(_sắp xếp theo tập tin_)\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2289,7 +2292,7 @@ msgstr ""
 "ABOUT-NLS (giới thiệu về NLS). Việc đặt ngôn ngữ chính\n"
 "cần thiết để thử ra bản dịch.\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2300,12 +2303,12 @@ msgstr ""
 "Hãy xác định miền địa phương bằng tùy chọn « --locale »\n"
 "hoặc xác định tập tin PO xuất bằng tùy chọn « --output-file »\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s đã được tạo.\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2314,12 +2317,12 @@ msgstr ""
 "Tạo một tập tin PO mới, cũng khởi động siêu thông tin bằng giá trị từ\n"
 "môi trường riêng của người dùng.\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=TẬP_TIN_NHẬP    tập tin dạng POT nhập vào (_nhập vào_)\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2330,14 +2333,14 @@ msgstr ""
 "để tìm tập tin POT.\n"
 "Nếu tập tin nhập vào là - , thiết bị nhập chuẩn được đọc.\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 "  -o, --output-file=TẬP_TIN      ghi kết xuất vào tập tin PO này.\n"
 "\t(_tập tin xuất_)\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2347,12 +2350,12 @@ msgstr ""
 "(miền địa phương) của thiết lập miền địa phương của người dùng.\n"
 "Nếu tập tin xuất là -, kết quả được ghi vào thiết bị xuất chuẩn.\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=NN_QQ        lập miền địa phương đích (v.d. vi_VN)\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
@@ -2360,7 +2363,7 @@ msgstr ""
 "      --no-translator         \tgiả sử tập tin PO được tạo ra tự động\n"
 "\t(_không có người dịch_)\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2368,12 +2371,12 @@ msgstr ""
 "Tìm thấy nhiều tập tin dạng .pot.\n"
 "Hãy xác định tập tin .pot nhập vào, bằng tùy chọn « --input » (nhập vào)\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "gặp lỗi khi đọc thư mục hiện thời"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2381,14 +2384,14 @@ msgstr ""
 "Không tìm thấy tập tin dạng .pot trong thư mục hiện thời.\n"
 "Hãy xác định tập tin .pot nhập vào, bằng tùy chọn « --input » (nhập vào)\n"
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "tiến trình phụ %s bị lỗi với mã thoát %d"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2403,7 +2406,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Bản dịch tiếng Việt cho gói %s"
@@ -2440,7 +2443,7 @@ msgstr "bộ ký tự đích « %s » không phải tên bảng mã di động."
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "cảnh báo : "
@@ -2697,7 +2700,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "tập tin nhập vào không chứa mục nhập phần đầu xác định bộ ký tự"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2716,7 +2719,7 @@ msgstr ""
 "chuỗi gốc « msgid » thì trở thành trùng."
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2725,16 +2728,16 @@ msgstr ""
 "Không thể chuyển đổi từ « %s » sang « %s ». %s phụ thuộc vào iconv() nhưng "
 "phiên bản này đã được xây dựng không có iconv()."
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s chỉ hợp lệ với %s"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "kiểu sao lưu"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2758,17 +2761,17 @@ msgstr ""
 "Khi không tìm thấy chuỗi dịch khớp chính xác, khả năng khớp mờ được dùng\n"
 "để cung cấp kết quả hữu ích hơn.\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  cũ.po                      chuỗi dịch tham chiếu đến nguồn cũ\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  mới.pot                     tham chiếu đến nguồn mới\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2778,7 +2781,7 @@ msgstr ""
 "\ttập hợp chuỗi dịch thêm, cũng có thể được xác định nhiều lần\n"
 "\t(_bản trích yếu_)\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2787,29 +2790,29 @@ msgstr ""
 "  -U, --update\tcập nhật tập tin cũ.po ; không làm gì\n"
 "\tnếu nó là hiện thời (_cập nhật_)\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ cập nhật:\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Kết quả được ghi về tập tin cũ.po\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=ĐIỀU_KHIỂN        sao lưu tập tin cũ.po (_sao lưu_)\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=HẬU_TỐ\n"
 "\tcó quyền cao hơn hậu tố sao lưu bình thường (_hậu tố_)\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2832,7 +2835,7 @@ msgstr ""
 "  simple, never\tluôn luôn tạo bản sao lưu đơn giản\n"
 "\t(_đơn giản, không bao giờ_)\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2844,7 +2847,7 @@ msgstr ""
 "hoặc bằng biến môi trường « SIMPLE_BACKUP_SUFFIX » (hậu tố sao lưu đơn "
 "giản).\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2852,22 +2855,22 @@ msgstr ""
 "      --previous\tgiữ lại các chuỗi gốc msgid cũ của chuỗi đã dịch "
 "(_trước_)\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       thu hồi cái chỉ tiến hành (_im_)\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "thông điệp này nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "thông điệp này không nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2875,30 +2878,30 @@ msgid ""
 msgstr ""
 "%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, làm mờ %ld, thiếu %ld, cũ %ld.\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " hoàn tất.\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s và tên tập tin dứt khoát loại từ lẫn nhau"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 "Chuyển đổi phân loại thông điệp nhị phân sang tập tin dạng .po kiểu "
 "Uniforum.\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2907,13 +2910,13 @@ msgstr ""
 "  -j, --java\n"
 "\tchế độ Java: kết nhập vào là hạng ResourceBundle kiểu Java\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 "      --csharp         chế độ C#: kết  nhập vào là tập tin .dll kiểu .NET\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2922,24 +2925,24 @@ msgstr ""
 "      --csharp-resources\n"
 "\tchế độ tài sản C#: kết nhập vào là tập tin .resources kiểu .NET\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl        chế độ Tcl: kết nhập vào là tập tin .msg kiểu tcl/msgcat\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  TẬP_TIN ...             nhập vào những tập tin dạng .mo\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "vị trí của tập tin nhập vào trong chế độ Java:\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2950,12 +2953,12 @@ msgstr ""
 "vào tên tài sản, định giới bằng dấu gạch dưới. Hạng được định vị\n"
 "bằng CLASSPATH (đường dẫn hạng).\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Vị trí của tập tin nhập vào trong chế độ C#:\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2965,12 +2968,12 @@ msgstr ""
 "Tập tin .dll nằm trong thư mục con của thư mục đã xác định\n"
 "có tên phụ thuộc vào miền địa phương.\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Vị trí của tập tin nhập vào trong chế độ Tcl:\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2979,18 +2982,18 @@ msgstr ""
 "Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
 "Tập tin .msg nằm trong thư mục đã xác định.\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                ghi kết xuất kiểu thụt lề (_thụt lề_)\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 "      --strict                ghi kiểu Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3012,12 +3015,12 @@ msgstr ""
 "chúng được lấy từ bản dịch thứ nhất. Vị trí tập tin sẽ được tích lũy.\n"
 "Dùng tùy chọn « --unique » (duy nhất) thì các bản sao bị hủy.\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              in ra chỉ bản sao (_được làm lại_)\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -3163,7 +3166,7 @@ msgstr "kết thúc dòng bên trong chuỗi"
 msgid "context separator <EOT> within string"
 msgstr "gặp dấu định giới ngữ cảnh <EOT> bên trong chuỗi"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tập tin này có thể không chứa chỉ thị miền"
@@ -3350,34 +3353,34 @@ msgstr "không thể tạo tập tin xuất « %s »"
 msgid "standard output"
 msgstr "thiết bị xuất chuẩn"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "lỗi tạo thư mục « %s »"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "lỗi biên dịch hạng C#, hãy thử tùy chọn « --verbose » (xuất chi tiết)"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "lỗi biên dịch hạng C#"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "không phải tên hạng Java hợp lệ: %s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "lỗi biên dịch hạng Java, hãy thử tùy chọn « --verbose » (xuất chi tiết) hoặc "
 "đặt biến $JAVAC"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "lỗi biên dịch hạng Java, hãy thử đặt biến $JAVAC"
@@ -3512,7 +3515,7 @@ msgstr "%s:%d: cảnh báo : hằng ký tự chưa được kết thúc"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: cảnh báo : bộ nghĩa chữ kiểu chuỗi chưa được kết thúc"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3621,32 +3624,32 @@ msgstr ""
 "thúc tập tin"
 
 # HEXNUMBER is a variable: do not translate/ HEXNUMBER là một biến: đừng dịch
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: thiếu dấu ngoặc móc đóng trên \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\l\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\u\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: phép nội suy biến không hợp lệ ở « %c »"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\L\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\U\") của ký tự 8-bit « %c »"
@@ -3751,29 +3754,29 @@ msgstr ""
 "%s:%lu: cảnh báo : cú pháp $\"...\" bị phản đối vì lý do bảo mật; hãy dùng "
 "eval_gettext thay thế."
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "không cho phép dùng tùy chọn « --join-existing » (nối lại tồn tại) khi kết "
 "xuất được ghi vào thiết bị xuất chuẩn"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "phần mềm xgettext không thể hoạt động khi không có từ khóa cần tìm"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "cảnh báo : không biết tập tin « %s » có phần mở rộng « %s » nên thử C"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Trích các chuỗi có thể dịch ra những tập tin nhập vào đã cho.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3783,12 +3786,12 @@ msgstr ""
 "\tdùng tập tin TÊN này như là kết xuất (thay cho messages.po)\n"
 "\t(_miền mặc định_)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=TẬP_TIN      ghi kết xuất vào tập tin này (_xuất_)\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3796,12 +3799,12 @@ msgstr ""
 "  -p, --output-dir=THƯ_MỤC\n"
 "\tcác tập tin xuất sẽ được để vào thư mục này (_thư mục xuất_)\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Chọn ngôn ngữ của tập tin nhập vào:\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3820,12 +3823,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                  tốc ký cho tùy chọn « --language=C++ »\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3834,7 +3837,7 @@ msgstr ""
 "Mặc định là ngôn ngữ được đoán phụ thuộc vào phần mở rộng của tên tập tin "
 "nhập vào.\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3843,26 +3846,26 @@ msgstr ""
 "      --from-code=MÃ        mã ký tự của tập tin nhập vào (_từ mã_)\n"
 "                                (trừ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Mặc định là giả sử tập tin nhập vào có bộ ký tự ASCII.\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         nối lại các thông điệp với tập tin đã có\n"
 "\t(_nối lại tồn tại_)\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=TẬP_TIN.po\n"
 "\tmục nhập từ tập tin này sẽ không được trích ra (_loại trừ tập tin_)\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3875,17 +3878,17 @@ msgstr ""
 "\tchèn khối chú thích với thẻ này (hay những điều nằm trước\n"
 "\tdòng từ khoá) vào tập tin xuất (_thêm chú thích_)\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Tùy chọn đặc trưng cho ngôn ngữ :\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           trích ra mọi chuỗi (_trích ra tất cả_)\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3898,7 +3901,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3907,7 +3910,7 @@ msgstr ""
 "  -k, --keyword[=TỪ]\n"
 "\ttừ khoá thêm cần tìm (không có TỪ thì không dùng từ khoá mặc định)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3917,7 +3920,7 @@ msgstr ""
 "      --flag=TỪ:ĐỐI_SỐ:CỜ\tcờ thêm cho chuỗi nằm bên trong đối số\n"
 "\tcó số ĐỐI SỐ của từ khoá TỪ (_cờ_)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3930,38 +3933,38 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs      hiểu chữ ba C kiểu ANSI để nhập vào (_chữ ba_)\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (chỉ ngôn ngữ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    nhận diện chuỗi định dạng Qt\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (chỉ ngôn ngữ C++)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   nhận ra chuỗi định dạng KDE4\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 nhận diện chuỗi định dạng Boost\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3969,21 +3972,21 @@ msgstr ""
 "      --debug\n"
 "\tkết quả nhận diện định dạng chuỗi chi tiết hơn (_gỡ lỗi _)\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output\n"
 "\tghi ra tập tin .properties (tài sản) kiểu Java (_xuất_)\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CHUỖI\n"
 "\tđặt người giữ bản quyền trong kết xuất\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3991,18 +3994,18 @@ msgstr ""
 "      --foreign-user\t\tbỏ sót bản quyền Tổ Chức Phần Mềm Tự Do\n"
 "\ttrong kết xuất cho người dùng nước ngoại\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=GÓI  \tđặt tên gói trong kết xuất\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=PHIÊN_BẢN  đặt phiên bản của gói trong kết xuất\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4010,7 +4013,7 @@ msgstr ""
 "      --msgid-bugs-address=ĐỊA_CHỈ_THƯ\n"
 "\tđặt địa chỉ thông báo lỗi trong chuỗi gốc msgid\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4020,7 +4023,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=CHUỖI]\n"
 "\tdùng chuỗi này hay « » là tiền tố cho mục nhập chuỗi dịch msgstr\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4030,7 +4033,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=CHUỖI]\n"
 "\tdùng chuỗi này hay « » là hậu tố cho mục nhập chuỗi dịch msgstr\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4038,31 +4041,31 @@ msgid ""
 msgstr ""
 "Đối số « --flag » (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "thiết bị nhập chuẩn"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: cảnh báo : "
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4071,7 +4074,7 @@ msgstr ""
 "Dù nó được dùng tại vị trí của chuỗi định dạng, %s không phải chuỗi định "
 "dạng %s hợp lệ. Lý do : %s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4080,7 +4083,7 @@ msgstr ""
 "Dù nó được tuyên bố như vậy, %s không phải chuỗi định dạng %s hợp lệ. Lý "
 "do : %s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4094,7 +4097,7 @@ msgstr ""
 "Đề nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
 "và sự ánh xạ thay cho đồ nhiều thành phần cho những đối số.\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4105,27 +4108,27 @@ msgstr ""
 "gettext(\"\") trả lại mục nhập phần đầu có siêu thông tin,\n"
 "không phải chuỗi rỗng.\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "đặc tả đối số mơ hồ cho từ khoá « %.*s »"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "cảnh báo : thiếu ngữ cảnh cho từ khoá « %.*s »"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "cảnh báo : thiếu ngữ cảnh cho đối số ở số nhiều của từ khoá « %.*s »"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ngữ cảnh xung đột giữa cách ở số ít và số nhiều"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4137,7 +4140,7 @@ msgstr ""
 "hãy xác định biến MSGID_BUGS_ADDRESS trong đó;\n"
 "không thì xác định tùy chọn dòng lệnh « --msgid-bugs-address ».\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "không biết ngôn ngữ « %s »"
@@ -4146,6 +4149,9 @@ msgstr "không biết ngôn ngữ « %s »"
 msgid "<unnamed>"
 msgstr "<không_tên>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: không cho phép tùy chọn « -- %c »\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle bị lỗi với mã lỗi 0x%08x"
 

diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index 2359699f81d8de01ba4cffead6b5e2793a10837a..a5abd935803d9eae0df469e936e4c6ddc8977a26 100644 (file)
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2009-03-20 20:06中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -33,22 +33,22 @@ msgstr "%2$s 的参数 %1$s 含糊"
 msgid "Valid arguments are:"
 msgstr "有效的参数为："
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "无法找到临时目录，请尝试设置 $TMPDIR 变量"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "无法用“%s”模板创建临时目录"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "无法删除临时文件 %s"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "无法删除临时目录 %s"
@@ -57,10 +57,10 @@ msgstr "无法删除临时目录 %s"
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
-#: src/xgettext.c:1855
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "打开“%s”读取时出错"
@@ -86,8 +86,8 @@ msgstr "写入“%s”出错"
 msgid "error after reading \"%s\""
 msgstr "读取“%s”后出错"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
-#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
@@ -104,74 +104,73 @@ msgstr "未找到 C# 编译器，试着安装 pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "未找到 C# 虚拟机，试着安装 pnet"
 
-#: gnulib-lib/error.c:153
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
-#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 子进程失败"
 
 #: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：选项“%s”含糊\n"
 
 #: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
 #: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
-#: gnulib-lib/getopt.c:991
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：选项“%s”需要参数\n"
 
 #: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
 #: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：非法选项 -- %c\n"
-
-#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
-#: gnulib-lib/getopt.c:1062
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要参数 -- %c\n"
 
-#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”含糊\n"
 
-#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许参数\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s：选项“%s”需要参数\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,14 +182,14 @@ msgstr "compile_java_class 中有无效的 source_version 参数"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 target_version 参数"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s”失败"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -206,8 +205,8 @@ msgstr "未找到 Java 编译器，试着安装 gcj 或设置 $JAVAC"
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "未找到 Java 虚拟机，试着安装 gij 或设置 $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
-#: src/msginit.c:1116
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
@@ -219,8 +218,8 @@ msgstr "%s 子进程 I/O 错误"
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
-#: gnulib-lib/pipe.c:261
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
 msgstr "无法创建管道"
@@ -280,7 +279,7 @@ msgstr "不像“msgid”，“%s”不是有效的 %s 格式字符串。原因
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
@@ -289,7 +288,7 @@ msgstr "“%2$s”中的参数 %1$u 的格式指定符在“msgid”中不存在
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 #: src/format-gcc-internal.c:638 src/format-librep.c:323
-#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
@@ -297,7 +296,7 @@ msgstr "参数 %u 的格式指定符在“%s”中不存在"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
 #: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -677,11 +676,11 @@ msgid ""
 "1 and 9."
 msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
-#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -694,38 +693,38 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
-#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:538
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
-#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”查看帮助信息。\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [选项]\n"
@@ -758,29 +757,29 @@ msgstr "  -f, --fqdn, --long          长主机名，包括全称域名和别名
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
-#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
-#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
-#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
@@ -789,11 +788,11 @@ msgstr "  -V, --version               输出版本信息并退出\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
-#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
@@ -802,206 +801,206 @@ msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "允许最多一个输入文件"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
-#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
-#: src/xgettext.c:565
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [选项] [输入文件]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根据消息的属性过滤一个翻译库里的消息，并处理消息的属性。\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
-#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
-#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:784
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:789
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
-#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "消息选择：\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            保留已翻译的，去掉未翻译的消息\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-previous        从所有条目中删除“previous msgid”\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=文件.po     只处理列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=文件.po   只处理未列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等于 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
-#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
-#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
-#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1009,115 +1008,137 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:874
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:876
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+"      --color                 总是使用颜色及其它文本属性\n"
+"      --color=WHEN            如果符合 WHEN，就使用颜色及其它文本属性。\n"
+"                              WHEN 可以"
+"是‘always’，‘never’，‘auto’或‘html’。\n"
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr "      --style=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             不在输出中使用 C 转码序列(默认)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:878
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转码序列，没有扩展字符\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:882
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:884
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不写入“#: 文件名:行号”位置行\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:886
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生成“#: 文件名:行号”位置行(默认)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:888
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页面宽度\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr "      --no-wrap               不将超过输出页宽度的长消息行断为多行\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:899
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出前排序\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:901
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 
-#: src/msgcat.c:321 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出现的选择条件 (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
@@ -1143,23 +1164,23 @@ msgstr ""
 "选项，那样则会由第一个包含该翻译条目的文件获取数据。所有 PO 文件中的翻译条目\n"
 "的文件位置都会累积下来。\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
-#: src/xgettext.c:786
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
 
-#: src/msgcat.c:407 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1177,7 +1198,7 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 0\n"
 
-#: src/msgcat.c:413 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1186,15 +1207,15 @@ msgstr ""
 "  -u, --unique                --less-than=2 的缩写，要求只列出出现一次\n"
 "                              的消息\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
-#: src/msgmerge.c:545
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
-#: src/msgmerge.c:547
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1202,12 +1223,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名称          输出的编码\n"
 
-#: src/msgcat.c:429 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1216,46 +1237,28 @@ msgstr ""
 "      --use-first             对每条消息均使用第一个可用的翻译，不合并若干\n"
 "                              种翻译\n"
 
-#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
-#: src/msgcat.c:434
-#, c-format
-msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-"      --color                 总是使用颜色及其它文本属性\n"
-"      --color=WHEN            如果符合 WHEN，就使用颜色及其它文本属性。\n"
-"                              WHEN 可以"
-"是‘always’，‘never’，‘auto’或‘html’。\n"
-
-#: src/msgcat.c:438
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
-
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:349
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "没有给出输入文件"
 
-#: src/msgcmp.c:194 src/msgmerge.c:354
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要两个输入文件"
 
-#: src/msgcmp.c:213 src/msgmerge.c:468
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [选项] def.po ref.pot\n"
@@ -1286,19 +1289,19 @@ msgstr "  def.po                      翻译\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     对源文件的引用\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:534
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "操作修饰：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:536
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr "  -m, --multi-domain          将 ref.pot 应用到 def.po 的每个域上\n"
 
-#: src/msgcmp.c:243 src/msgmerge.c:538
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不使用模糊匹配\n"
@@ -1323,17 +1326,17 @@ msgstr "此条目未翻译"
 msgid "this message needs to be reviewed by the translator"
 msgstr "此条目需要由翻译者复审"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1482
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "此消息使用了但却未定义..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1485
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但此定义十分类似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1513
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "此消息已使用，但未定义于 %s 中"
@@ -1349,12 +1352,12 @@ msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "发现 %d 处致命错误"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "需要至少指定两个文件"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1372,7 +1375,7 @@ msgstr ""
 "息）。翻译内容、自行加上的注释和源程序注释的批注都会保留，但只会保留最先定义\n"
 "这些信息的 PO 文件中的内容。所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1381,67 +1384,67 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:903
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不写入带有“msgid \"\"”项的文件头项\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "转换目标：\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "默认编码为当前区域设置的编码。\n"
 
-#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
-#: src/msgmerge.c:563
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
-#: src/msgmerge.c:565
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
-#: src/msgmerge.c:567
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
 
-#: src/msgen.c:241
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要一个输入文件"
 
-#: src/msgen.c:286
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [选项] 输入文件\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1453,7 +1456,7 @@ msgstr ""
 "(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串，\n"
 "并标记为模糊。\n"
 
-#: src/msgen.c:303
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
@@ -1492,7 +1495,7 @@ msgstr ""
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:389
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
@@ -1507,27 +1510,27 @@ msgstr "写入 stdout 失败"
 msgid "write to %s subprocess failed"
 msgstr "写入 %s 子进程失败"
 
-#: src/msgfilter.c:277
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:301
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:376
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] 过滤器 [过滤器选项]\n"
 
-#: src/msgfilter.c:380
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:404
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1536,18 +1539,18 @@ msgstr ""
 "<过滤器>可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:409
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=脚本       将<脚本>添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:413
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1555,24 +1558,24 @@ msgid ""
 "                                to be executed\n"
 msgstr "  -f, --file=脚本文件         将<脚本文件>的内容添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:416
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       禁用对模式空白的自动打印\n"
 
-#: src/msgfilter.c:428 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             在输出中不使用 C 转义字符(默认)\n"
 
-#: src/msgfilter.c:434 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:436
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1589,22 +1592,22 @@ msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
@@ -1649,7 +1652,7 @@ msgstr "用法：%s [选项] 文件名.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:659 src/xgettext.c:773
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1663,7 +1666,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
@@ -1712,7 +1715,7 @@ msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:694 src/xgettext.c:797
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
@@ -1722,13 +1725,13 @@ msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模式输出文件位置：\n"
 
-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资源         资源名称\n"
 
-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1758,7 +1761,7 @@ msgstr ""
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:717 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1779,7 +1782,7 @@ msgstr ""
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:727 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  --d 目录                    .msg 消息库的基本目录\n"
@@ -1791,7 +1794,7 @@ msgid ""
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:741 src/xgettext.c:813
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
@@ -1867,7 +1870,7 @@ msgstr "      --no-hash               二进制文件将不包含哈希表\n"
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
@@ -1922,7 +1925,7 @@ msgstr "忽略了模糊的“msgstr”项"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
-#: src/msggrep.c:255 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
 #: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
@@ -1933,21 +1936,21 @@ msgstr "%s：警告：源文件包含模糊的翻译条目"
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定“J”、“K”、“T”、“C”或“X”前不能使用选项“%c”"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "提取翻译库中的消息，这些消息符合某个给出的模式或属于某个给出的源文件。\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2021,23 +2024,23 @@ msgstr ""
 "  -i, --ignore-case           忽略大小写区别\n"
 "  -v, --invert-match          仅输出不符合任何条件的消息\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr "      --escape                在输出中使用 C 转义字符，没有扩展字符\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           生成排序输出\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根据文件位置排序输出\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2046,7 +2049,7 @@ msgstr ""
 "系统环境没有任何和语言有关的设置。请根据 ABOUT-NLS 文件所述，\n"
 "设置 LANG 环境变量。这是测试翻译前的必要步骤。\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2057,24 +2060,24 @@ msgstr ""
 "请通过 --locale 选项指定语系或\n"
 "--output-file 选项指定输出的 .po 文件。\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "已创建 %s。\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "创建新的 PO 文件，即根据用户环境取值初始化文件头。\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=输入文件        输入的 POT 文件\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2084,12 +2087,12 @@ msgstr ""
 "如果没有给出输入文件，将会搜索当前目录中的 POT 文件。\n"
 "如果为 - 的话，将会读取标准输入。\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=文件      将输出写入至指定的 PO 文件\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2099,18 +2102,18 @@ msgstr ""
 "定。\n"
 "如果输出文件是“-”，则会将结果写入至标准输出。\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          设置目标语系\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假定 PO 文件是自动生成的\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2118,12 +2121,12 @@ msgstr ""
 "找到多于一个的 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "读取当前的目录时发生错误"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2131,14 +2134,14 @@ msgstr ""
 "在当前目录中找不到任何 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
 #: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
 #: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 子进程失败，错误码为 %d"
 
-#: src/msginit.c:1094
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2152,7 +2155,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1510
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
@@ -2187,7 +2190,7 @@ msgstr "目标字符集编码“%s”不是通用的编码名称。"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2957
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2422,7 +2425,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件不包含指定字符集的文件头项"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:622 src/xgettext.c:640
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2437,23 +2440,23 @@ msgid ""
 msgstr "从“%s”转换为“%s”出现了重复项：某些原本不同的 msgid 变成了相同项。"
 
 #: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:647
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr "无法从“%s”转换为“%s”。%s 需要 iconv()。此版本创建时未包含 iconv()。"
 
-#: src/msgmerge.c:371 src/msgmerge.c:377
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:436
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "备份类型"
 
-#: src/msgmerge.c:473
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2474,24 +2477,24 @@ msgstr ""
 "在程序执行的过程中找不到完全匹配的文字，则会使用模糊的匹配以求达到较好的\n"
 "效果。\n"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      根据旧源文件进行的翻译成果\n"
 
-#: src/msgmerge.c:492
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     对新源文件的引用\n"
 
-#: src/msgmerge.c:496
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=文件       消息翻译的额外库，可指定多个\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2500,27 +2503,27 @@ msgstr ""
 "  -U, --update                更新 def.po,\n"
 "                              如果 def.po 已经是最新则不作任何事\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "以更新模式输出文件位置：\n"
 
-#: src/msgmerge.c:516
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "结果将写回 def.po 中。\n"
 
-#: src/msgmerge.c:518
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=备份方法       备份 def.po\n"
 
-#: src/msgmerge.c:520
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=后缀           覆盖默认备份后缀\n"
 
-#: src/msgmerge.c:522
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2538,7 +2541,7 @@ msgstr ""
 "  existing, nil   如果编号备份存在则继续编号，否则执行简单备份\n"
 "  simple, never   总是制作简单的备份\n"
 
-#: src/msgmerge.c:529
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2547,28 +2550,28 @@ msgid ""
 msgstr ""
 "备份后缀是“~”，您可以用 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置。\n"
 
-#: src/msgmerge.c:540
+#: src/msgmerge.c:552
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr "      --previous              保留已翻译条目的 msgids\n"
 
-#: src/msgmerge.c:591 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隐藏进度指示\n"
 
-#: src/msgmerge.c:1586
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此消息应定义复数形式"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此消息不应定义复数形式"
 
-#: src/msgmerge.c:2012
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2577,40 +2580,40 @@ msgstr ""
 "%s读取了 %ld 条旧的 + %ld 条引用，合并了 %ld 条，模糊的 %ld 条，缺少 %ld 条，"
 "过时的 %ld 条。\n"
 
-#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
 #: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s 和明确给定的文件名互相冲突"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "用法：%s [选项] [文件]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "将二进制消息库转换为 Uniforum 风格的 .po 文件。\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模式：输入为 Java 资源包类\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：输入为 .NET .dll 文件\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2618,23 +2621,23 @@ msgid ""
 msgstr ""
 "      --csharp-resources      C# 资源模式：输入为 .NET .resources 文件\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  文件 ...                    输入的 .mo 文件\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "以 Java 模式输入文件位置：\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2644,12 +2647,12 @@ msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "类会使用 CLASSPATH 定位。\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2658,29 +2661,29 @@ msgstr ""
 "-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语"
 "系。\n"
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 模式下的输入文件位置：\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                写出缩进的输出风格\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                写出严格的 Uniforum 风格\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2699,12 +2702,12 @@ msgstr ""
 "累积起来，但如果指定了 --use-first 选项，则会从第一个翻译中取得注释。文件位置\n"
 "将会累积。如果使用了 --unique 选项，重复项将会被忽略。\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只打印重复项\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2844,7 +2847,7 @@ msgstr "字符串内遇到行尾"
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:332 src/xgettext.c:945
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
@@ -3017,32 +3020,32 @@ msgstr "无法创建输出文件“%s”"
 msgid "standard output"
 msgstr "标准输出"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "创建目录“%s”失败"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "编译 C# 类失败，试试 --verbose"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, c-format
 msgid "compilation of C# class failed"
 msgstr "编译 C# 类失败"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "不是有效的 Java 类名：%s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC 变量"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
@@ -3169,7 +3172,7 @@ msgstr "%s:%d：警告：未结束的字符常量"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结束的字符串字面"
 
-#: src/x-csharp.c:224 src/xgettext.c:1962
+#: src/x-csharp.c:224 src/xgettext.c:2020
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3270,32 +3273,32 @@ msgstr "%s:%d：警告：未结束的字符串 U+%04X"
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d：在文件结束符前的任何位置都找不到字符串结束符“%s”"
 
-#: src/x-perl.c:1041
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d：在 \\x{十六进制数} 处缺少右大括号"
 
-#: src/x-perl.c:1161
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\l”)"
 
-#: src/x-perl.c:1181
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\u”)"
 
-#: src/x-perl.c:1215
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d：“%c”处有无效的变量转义"
 
-#: src/x-perl.c:1228
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\L”)"
 
-#: src/x-perl.c:1245
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
@@ -3392,50 +3395,50 @@ msgid ""
 "use eval_gettext instead"
 msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
 
-#: src/xgettext.c:569
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:574
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:717
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：文件“%s”扩展名“%s”未知；看作 C 语言"
 
-#: src/xgettext.c:768
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr "  -d, --default-domain=名称   使用<名称.po>输出(而不是 messages.po)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:795
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:802
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3454,19 +3457,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-源, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:810
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "默认情况下，所使用的语言是根据输入文件的扩展名猜测的。\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3475,22 +3478,22 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:818
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=文件.po  文件.po中的项不提取\n"
 
-#: src/xgettext.c:827
+#: src/xgettext.c:879
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3502,17 +3505,17 @@ msgstr ""
 "  -c, --add-comments[=标记]   在输出文件中放置用<标记>(或类似的关键字\n"
 "                              行)标明的注释块\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:835
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:837 src/xgettext.c:844
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3526,7 +3529,7 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源, Glade 语言)\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:893
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3535,7 +3538,7 @@ msgstr ""
 "  -k, --keyword[=单词]        要查找的额外关键字(不指定<单词>表明不使用\n"
 "                              默认关键字)\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3546,7 +3549,7 @@ msgstr ""
 "标\n"
 "                              志\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3560,75 +3563,75 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:857
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:890
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:913
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  设置报告 msgid 错误的地址\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:973
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3637,7 +3640,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的前缀\n"
 
-#: src/xgettext.c:918
+#: src/xgettext.c:976
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3646,38 +3649,38 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
 
-#: src/xgettext.c:1724
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:1823
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:1927
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1931
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1936
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2045
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3685,14 +3688,14 @@ msgid ""
 msgstr ""
 "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
 
-#: src/xgettext.c:2046
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "以所声明的语言 %2$s 来看，%1$s 不是有效的格式字符串。原因：%3$s\n"
 
-#: src/xgettext.c:2077
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3704,7 +3707,7 @@ msgstr ""
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2139
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3714,27 +3717,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2776
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:2803
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:2849
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:2958
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3745,7 +3748,7 @@ msgstr ""
 "“Makevars”文件，请指定 MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3168
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "语言“%s”未知"
@@ -3754,6 +3757,9 @@ msgstr "语言“%s”未知"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：非法选项 -- %c\n"
+
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
 #~ msgstr "DuplicateHandle 失败，错误码为 0x%08x"
 

diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index c93b22667b8b910351bf4d02e775be22b9918360..92e0ef64c68873a724994355bbfb8bdd23456f6e 100644 (file)
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2005-12-06 08:31+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,22 +33,22 @@ msgstr "%2$s 的參數 %1$s 不明確"
 msgid "Valid arguments are:"
 msgstr "有效的參數為："
 
-#: gnulib-lib/clean-temp.c:333
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "找不到暫存檔目錄，正嘗試設定 $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:347
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 
-#: gnulib-lib/clean-temp.c:443
+#: gnulib-lib/clean-temp.c:445
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "無法產生輸出檔 “%s”"
 
-#: gnulib-lib/clean-temp.c:458
+#: gnulib-lib/clean-temp.c:460
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
@@ -57,44 +58,44 @@ msgid "write error"
 msgstr "寫入時發生錯誤"
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "無法開啟備份檔 “%s” 來寫入內容"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "讀取 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "寫入 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "完成讀取 “%s” 後發生錯誤"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
+#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
 #: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
 #: src/read-tcl.c:110 src/write-resources.c:77
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() 失敗"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "找不到 C# 編譯器，請安裝 pnet"
@@ -104,74 +105,73 @@ msgstr "找不到 C# 編譯器，請安裝 pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "找不到 C# virtual machine，請安裝 pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "系統出現不明錯誤"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 副進程發生錯誤"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：選項 ‘%s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘--%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘%c%s’ 不可配合參數使用\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：選項 ‘%s’ 需要參數\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：無法辨識 ‘--%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：無法辨識 ‘%c%s’ 選項\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：選項不合法 -- %c\n"
-
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
-#, c-format
-msgid "%s: invalid option -- %c\n"
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：選項需要參數 -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：選項 ‘-W %s’ 不明確\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：選項 ‘-W %s’ 不可配合參數使用\n"
 
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s：選項 ‘%s’ 需要參數\n"
+
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,20 +183,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
-#: src/write-java.c:1038
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "無法建立 “%s”"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
-#: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "當寫入檔案 “%s” 時發生錯誤"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變數"
@@ -206,20 +206,20 @@ msgstr "找不到 Java 編譯器，請安裝 gcj 或是設定 $JAVAC 環境變
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "找不到 Java virtual machine，請安裝 gij 或是設定 $JAVA 環境變數"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
+#: src/msginit.c:1140
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 副進程輸出/輸入錯誤"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
 #: gnulib-lib/pipe.c:265
 #, c-format
 msgid "cannot create pipe"
@@ -238,70 +238,69 @@ msgstr "無法建立管線"
 #. 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.
+#. 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_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle 失敗，錯誤碼為 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失敗"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "無法產生輸出檔 “%s”"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s 副進程"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 副進程出現代表嚴重錯誤的訊號 %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "和 ‘msgid’ 不同，‘%s’ 的 %s 格式字串無效。原因：%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
-#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘msgid’ 中並不存在"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "第 %u 個參數的規格在‘%s’中並不存在"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "‘msgid’和‘%s’的第 %u 個參數的規格並不相同"
 
 #: src/format-boost.c:449
@@ -328,9 +327,9 @@ msgstr "在第 %u 個參數，‘<’ 之後的關鍵字後面缺少了 ‘>’
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字串中有提及第 %u 個參數，但忽略了第 %u 個。"
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "‘msgid’ 和 ‘%s’ 的參數數目不符"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -370,48 +369,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "第 %u 個參數後出現單獨的 ‘}’。"
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, fuzzy, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, fuzzy, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "第 %u 個參數中的數字 0 不是正整數。"
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, fuzzy, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "‘msgid’ 使用了 %%m 但 ‘%s’ 沒有。"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
 
 #: src/format-invalid.h:22
@@ -501,21 +500,20 @@ msgid ""
 msgstr ""
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中的參數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "參數 {%u} 的規格在 ‘%s’ 中並不存在"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "‘msgid’ 和 ‘%s’ 的參數 {%u} 規格並不相同"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -529,11 +527,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -580,13 +578,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "‘msgid’ 和 ‘%s’ 的參數規格並非同等"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "‘%s’ 的參數規格並非 ‘msgid’ 的參數規格的一部份"
 
 #: src/format-perl.c:433
@@ -596,56 +594,53 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "參數 ‘%s’ 的規格在 ‘%s’ 中並不存在"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "‘msgid’ 裡的規格對應的是雜湊表 (mapping)，而 ‘%s’ 的卻是固定有序列 (tuple)"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "‘msgid’ 裡的規格對應的是固定有序列 (tuple)，而 ‘%s’ 的卻是雜湊表 (mapping)"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中的參數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "‘msgid’和‘%s’的參數‘%s’的格式並不相同"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -683,11 +678,11 @@ msgid ""
 "1 and 9."
 msgstr "第 %u 個參數最後一個字元不是 1 至 9 之間的整數。"
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
+#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
+#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -696,38 +691,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
-#: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "參數過多"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "請執行 ‘%s --help’ 顯示額外資訊。\n"
 
-#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "用法：%s [選項]\n"
@@ -761,29 +756,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊：\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示本訊息，然後結束\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊，然後結束\n"
@@ -792,11 +787,11 @@ msgstr "  -V, --version               顯示版本資訊，然後結束\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
@@ -805,206 +800,206 @@ msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 msgid "could not get host name"
 msgstr "無法取得主機名稱"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
-#: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "最多只接受一個輸入檔"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
-#: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 兩者是互不相容的"
 
-#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [選項] [輸入檔]\n"
 
-#: src/msgattrib.c:400
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根據訊息的屬性過濾翻譯檔裡的條目，並處理這些屬性。\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
-#: src/msguniq.c:329
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定<目錄>\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
-#: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔位置：\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定<檔案>\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
-#: src/msgunfmt.c:481 src/msguniq.c:345
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示結果。\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "篩選訊息：\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:438
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:440
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:439
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:441
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:443
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:445
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:447
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:449
+#: src/msgattrib.c:461
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:463
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     只處理 FILE.po 裡已經有的條目\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:465
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr "      --ignore-file=FILE.po   只處理 FILE.po 裡沒有的條目\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等於 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:469
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
-#: src/msguniq.c:356
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "輸入檔格式：\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      以 Java .properties 格式處理輸入檔\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1012,17 +1007,35 @@ msgid ""
 msgstr ""
 "      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#, c-format
+msgid ""
+"      --color                 use colors and other text attributes always\n"
+"      --color=WHEN            use colors and other text attributes if WHEN.\n"
+"                              WHEN may be 'always', 'never', 'auto', or "
+"'html'.\n"
+msgstr ""
+
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#, c-format
+msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgstr ""
+
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1030,9 +1043,9 @@ msgstr ""
 "  -e, --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1041,66 +1054,66 @@ msgstr ""
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算沒有內容仍產生 PO 檔\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                寫入的 .po 檔內容會進行縮排\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不加入類似 '#: 檔案:行號' 的源代碼位置\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          會加入 '#: 檔案:行號' 格式的源代碼位置 (預設)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output    產生 Java .properties 檔案\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔每行寬度\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1108,31 +1121,31 @@ msgid ""
 msgstr ""
 "      --no-wrap               即使輸出的訊息超出頁寬，也不將輸出的訊息斷行\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           將輸出結果排序\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出現的選擇條件 (%d < n <%d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [選項] [輸入檔]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1153,23 +1166,23 @@ msgstr ""
 "--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
 "所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               輸入檔\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       由 FILE 讀取所有輸入檔的位置\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀取資料。\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:398
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1178,7 +1191,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      當一項條目的不同翻譯少於多少種就會顯示，\n"
 "                              預設為無限 (即顯示所有條目)\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1187,7 +1200,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      當一項條目的不同翻譯多於多少種才會顯示，\n"
 "                              預設為 0 種 (即顯示所有條目)\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:404
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1196,15 +1209,15 @@ msgstr ""
 "  -u, --unique                等於 --less-than=2，表示只顯示\n"
 "                              只有一種翻譯的字句\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      輸入檔格式為 Java .properties 格式\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1212,12 +1225,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名稱          輸出的編碼\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1226,41 +1239,33 @@ msgstr ""
 "      --use-first             每句只使用第一個出現的翻譯，而不會將所有\n"
 "                              翻譯合併起來\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
 msgid ""
-"      --color                 use colors and other text attributes always\n"
-"      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
-msgstr ""
-
-#: src/msgcat.c:424
-#, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "未指定輸入檔"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要恰好指定兩個輸入檔"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [選項] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1276,22 +1281,22 @@ msgstr ""
 "此程式可用來檢查程式中的所有的訊息是否都已經翻譯好了。比較時如果\n"
 "有不完全配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      翻譯檔\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     未翻譯檔案\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "運作模式有關選項：\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1299,58 +1304,63 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          將 ref.pot 套用於 def.po 中的每一個領域\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:550
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     不進行模糊字串配對\n"
+
+#: src/msgcmp.c:245
 #, fuzzy, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, fuzzy, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "這個訊息有使用過但沒有定義..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但這個定義很相似"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "這個訊息有使用過但在 %s 中沒有定義"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "找到 %d 個嚴重錯誤"
 
-#: src/msgcomm.c:303
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "必須指定至少兩個檔案"
 
-#: src/msgcomm.c:351
+#: src/msgcomm.c:363
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1368,7 +1378,7 @@ msgstr ""
 "訊息）。翻譯內容、自行加上的註解和原程式碼的註解都會保留，但只會由第一個\n"
 "含有該翻譯條目的檔案取得。所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcomm.c:389
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1376,67 +1386,67 @@ msgid ""
 msgstr ""
 "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:451 src/xgettext.c:961
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr "      --omit-header           不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
 
-#: src/msgconv.c:294
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "轉換目標：\n"
 
-#: src/msgconv.c:322
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "預設的編碼為目前語言的編碼。\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           不輸出源代碼位置\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留源代碼位置 (預設)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
 
-#: src/msgen.c:233
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要恰好指定一個輸入檔"
 
-#: src/msgen.c:274
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [選項] 輸入檔\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1447,22 +1457,22 @@ msgstr ""
 "產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
 "未翻譯的條目會填上和 msgid 一樣的字串。\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  輸入檔                      作為輸入的 PO 或 POT 檔\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "缺少了指令名稱"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [選項] 指令 [指令選項]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1477,7 +1487,7 @@ msgstr ""
 "即是 msgexec 的輸出結果。msgexec 的回傳值是所有\n"
 "指令執行的回傳值的最大值。\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1486,42 +1496,42 @@ msgstr ""
 "有一個稱為 '0' 的特殊內置指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
 "“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "寫入至 %s 副進程時發生錯誤"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "未指定過濾器"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必須指定至少一個 sed script"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [選項] 過濾器 [過濾器選項]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1530,18 +1540,18 @@ msgstr ""
 "<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
 "並將修改後的翻譯寫進標準輸出的程式。\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項：\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:423
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:425
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1549,13 +1559,13 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       不會自動顯示過濾後的結果\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1563,124 +1573,106 @@ msgstr ""
 "      --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                將輸出結果進行縮排\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:454
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保護標頭內容，過濾內容時不會被更改\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "功能尚未編寫。"
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "無法和 %s 副進程建立非專用的 I/O"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "和 %s 副進程溝通時出現錯誤"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "由 %s 副進程讀入資料時出現錯誤"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 副進程已終止，錯誤碼為 %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的參數應該是一個標點符號"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
-#: src/msgunfmt.c:341
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定 “-d 目錄” 選項"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定 “-l locale” 選項"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "已翻譯 %d 個條目"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，有 %d 個條目標記為模糊翻譯"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，還有 %d 個條目未翻譯"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [選項] filename.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:825
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr "長選項必要的參數在使用短選項時也是必要的。對於選擇性的參數也一樣。\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1688,7 +1680,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1697,12 +1689,12 @@ msgstr ""
 "      --java2                 類似 --java，假設格式為 Java2 (JDK 1.2 或以"
 "上)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1711,39 +1703,39 @@ msgstr ""
 "      --csharp-resources      C# resources 模式，會產生 .NET .resources 檔"
 "案\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：產生 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource 名稱\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
-#: src/msgunfmt.c:459 src/msgunfmt.c:469
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1752,13 +1744,13 @@ msgstr ""
 "  -l, --locale=LOCALE         指定語言，可以用語言名稱或者 xy_XY 格式的\n"
 "                              語言代號\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1769,48 +1761,48 @@ msgstr ""
 "class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
 "-d 選項是必須的。class 檔會存放在指定的目錄。\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:473
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1821,19 +1813,19 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查各種程式語言的格式字串\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          確保標頭欄位存在和內容正確\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1842,7 +1834,7 @@ msgstr ""
 "      --check-domain          檢查 domain 關鍵字和 --output-file 選項之間\n"
 "                                有沒有衝突\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1851,7 +1843,7 @@ msgstr ""
 "  -C, --check-compatibility   確保 GNU msgfmt 運作的方式和 X/Open msgfmt 兼"
 "容\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1859,111 +1851,111 @@ msgid ""
 "                                menu items\n"
 msgstr "      --check-accelerators[=CHAR]  檢查選單項目中代表捷徑鍵的字元\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=數字        以<數字>個位元組為單位配置字串位置(預設：%d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               二元碼檔不會包含雜湊表 (hash table) 在內\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊息的統計\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               顯示詳細資訊\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：缺少了 PO 檔的標頭或是格式無效\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字元集轉換的功能不會生效\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 檔的標頭仍然是模糊狀態\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "領域名稱 “%s” 不適合作為檔案名稱"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "領域名稱 “%s” 不適合作為檔案名稱：將使用字首"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "忽略‘domain %s’指令"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "忽略空的‘msgstr’欄位"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略模糊的‘msgstr’欄位"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：原始檔包含模糊翻譯條目"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取 “%s” 時出現錯誤"
 
-#: src/msggrep.c:484
+#: src/msggrep.c:496
 #, fuzzy, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr "未指定 ‘K’、‘T’ 或 ‘C’ 選項前不能使用選項 ‘%c’"
 
-#: src/msggrep.c:504
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "抽取翻譯檔中的訊息，而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
 
-#: src/msggrep.c:530
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2032,7 +2024,7 @@ msgstr ""
 "  -f, --file=FILE             PATTERN 採用 FILE 的內容 \n"
 "  -i, --ignore-case           不區分大小寫\n"
 
-#: src/msggrep.c:579
+#: src/msggrep.c:597
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
@@ -2041,17 +2033,17 @@ msgstr ""
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msggrep.c:600
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           將訊息排序\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根據檔案位置排序\n"
 
-#: src/msginit.c:285
+#: src/msginit.c:297
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2060,7 +2052,7 @@ msgstr ""
 "系統環境沒有任何和語言有關的設定。請根據 ABOUT-NLS 檔案所述，\n"
 "設定 LANG 環境變數。這是測試翻譯時的必要步驟。\n"
 
-#: src/msginit.c:309
+#: src/msginit.c:321
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2071,24 +2063,24 @@ msgstr ""
 "請透過 --locale 選項指定語系或\n"
 "--output-file 選項指定輸出的 .po 檔。\n"
 
-#: src/msginit.c:335
+#: src/msginit.c:347
 #, c-format
 msgid "Created %s.\n"
 msgstr "已建立 %s。\n"
 
-#: src/msginit.c:355
+#: src/msginit.c:367
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr "建立新的 PO 檔，並由使用者環境取得初始化所需的檔頭資料。\n"
 
-#: src/msginit.c:365
+#: src/msginit.c:377
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=輸入檔          輸入的 POT 檔\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:379
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2098,12 +2090,12 @@ msgstr ""
 "如果沒有指定輸入檔，會在目前的目錄搜尋 POT 檔。\n"
 "如果輸入檔是 -，則讀取標準輸入的內容。\n"
 
-#: src/msginit.c:373
+#: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      將輸出的內容寫入指定的 PO 檔\n"
 
-#: src/msginit.c:375
+#: src/msginit.c:387
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2112,18 +2104,18 @@ msgstr ""
 "如果沒有指定輸出檔，檔名將會由 --locale 選項或使用者的語系決定。\n"
 "如果輸出檔是 -，則會將結果寫至標準輸出。\n"
 
-#: src/msginit.c:388
+#: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          指定地區設定\n"
 
-#: src/msginit.c:390
+#: src/msginit.c:402
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr "      --no-translator         假設 PO 檔是自動產生的\n"
 
-#: src/msginit.c:450
+#: src/msginit.c:468
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2131,12 +2123,12 @@ msgstr ""
 "找到多於一個的 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:458 src/msginit.c:463
+#: src/msginit.c:476 src/msginit.c:481
 #, c-format
 msgid "error reading current directory"
 msgstr "讀取目前的目錄時發生錯誤"
 
-#: src/msginit.c:471
+#: src/msginit.c:489
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2144,14 +2136,14 @@ msgstr ""
 "在目前目錄中找不到任何 .pot 檔。\n"
 "請透過 --input 選項指定作為輸入檔的 .pot 檔。\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
+#: src/read-tcl.c:127 src/write-resources.c:104
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s 副進程失敗，錯誤碼為 %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1118
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2165,47 +2157,47 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1534
 #, c-format
 msgid "English translations for %s package"
 msgstr "Traditional Chinese translation for %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "目前的字元集編碼 “%s” 不是通用的編碼名稱"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "輸入檔有兩種不同的字元集編碼 “%s” 和 “%s”"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "輸入檔‘%s’的標頭欄位中沒有指定字元集"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr "輸入檔 ‘%2$s’ 的 domain “%1$s” 的標頭欄位中沒有指定字元集"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目標的字元集編碼 “%s” 不是通用的編碼名稱。"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "警告："
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2213,7 +2205,7 @@ msgid ""
 msgstr ""
 "輸入檔含有不同編碼的訊息，其中一種是 UTF-8。會將輸出的編碼轉換為 UTF-8。\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2224,7 +2216,7 @@ msgstr ""
 "輸入檔含有不同編碼的訊息，其中包括 %s 和 %s。會將輸出的編碼轉換為 UTF-8。\n"
 "若要選擇另一種輸出編碼，請使用 --to-code 選項。\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2233,7 +2225,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2245,12 +2237,12 @@ msgstr ""
 "‘%s’的輸出可能有誤。\n"
 "可行的解決方法包括：\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- 設定 LC_ALL 環境變數為使用編碼 %s 的語系。\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2261,7 +2253,7 @@ msgstr ""
 "  然後套用 ‘%s’ 指令過濾內容，\n"
 "  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2274,7 +2266,7 @@ msgstr ""
 "  然後套用 ‘%s’ 指令過濾內容，\n"
 "  最後再用 ‘msgconv’ 將翻譯檔的字元集還原為 %s。\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2285,75 +2277,75 @@ msgstr ""
 "‘%s’ 的輸出可能有誤。\n"
 "設定 LC_ALL=C 是一個可行的解決方法。\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "複數表示式可能產生負數"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但複數表示式的最大值可能等於 %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "複數表示式會引致被 0 整除的錯誤"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "複數表示式會引致整數溢位的錯誤"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "複數表示式會引致運算錯誤，例如被 0 整除"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "嘗試使用下列 %s 中屬於合法的型態:\n"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "翻譯檔含有複數型態的翻譯..."
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...但檔頭缺少了像 “plural=表示式” 的項目"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...但檔頭缺少了像 “nplurals=整數” 的項目"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "無效的 nplurals 值"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "無效的複數表示式"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...但某些訊息只有 %lu 種複數型態"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...但某些訊息有 %lu 種複數型態"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2361,82 +2353,82 @@ msgstr ""
 "翻譯檔含有複數型態的翻譯，但缺少了以下的標頭欄位：\n"
 "“Plural-Forms: nplurals=<整數>; plural=<表示式>;”"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' 和 `msgid_plural' 欄位並非同時以 '\\n' 開始"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’開始"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgid_plural’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄位並非同時以‘\\n’結束"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "複數處理是 GNU gettext 的擴展功能"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "缺少了標頭欄位‘%s’\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "標頭欄位‘%s’應該位於行首\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "某些標頭欄位仍然是預設值\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "æ¨\99é ­æ¬\84ä½\8dâ\80\98%sâ\80\99仍然是預設值\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "æ\9f\90äº\9bæ¨\99é ­æ¬\84ä½\8d仍然是預設值\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄位"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2445,7 +2437,7 @@ msgstr ""
 "不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv()，但 iconv() 不支援此種轉換"
 "方式。"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2453,8 +2445,8 @@ msgid ""
 msgstr ""
 "由 “%s” 轉換至 “%s” 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2463,16 +2455,16 @@ msgstr ""
 "不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv()，但編譯此程式時沒有 iconv"
 "() 支援。"
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "備份方式"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2492,51 +2484,51 @@ msgstr ""
 "的註解都會被捨棄，但特殊旗標註解和檔案位置都會被保留。比較時如果有不完全\n"
 "配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      舊版本的翻譯檔\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     新版本程式的翻譯檔\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=FILE       額外的翻譯記憶庫，選項可以使用多次\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr "  -U, --update                更新 def.po (僅當 def.po 未更新時)\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "更新模式的檔案輸出位置：\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "輸出結果會寫入至 def.po。\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        將 def.po 備份\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         自行指定備份檔名末端的字串\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:534
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2554,7 +2546,7 @@ msgstr ""
 "  existing, nil   若有數字的備份檔已經存在則使用數字，否則使用一般名稱\n"
 "  simple, never   永遠使用普通方式備份\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:541
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2564,62 +2556,59 @@ msgstr ""
 "備份檔的後置字元為‘~’，除非以 --suffix 選項或是 SIMPLE_BACKUP_SUFFIX\n"
 "環境變數指定。\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     不進行模糊字串配對\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:552
 #, fuzzy, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隱藏進度指示\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此訊息應該有複數型態"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此訊息不應有複數型態"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2030
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 "%s\n"
-"讀入 %ld 舊翻譯 + %ld 參考條目。合併：%ld，模糊：%ld，未譯：%ld，過時：%"
-"ld。\n"
+"讀入 %ld 舊翻譯 + %ld 參考條目。合併：%ld，模糊：%ld，未譯：%ld，過時："
+"%ld。\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " 完成。\n"
 
-#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
+#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "使用 %s 不能同時指定檔案名稱"
 
-#: src/msgunfmt.c:415
+#: src/msgunfmt.c:427
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "用法：%s [選項] [檔案]...\n"
 
-#: src/msgunfmt.c:419
+#: src/msgunfmt.c:431
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "將二元碼翻譯檔轉換為 Uniforum 型式的 .po 檔。\n"
 
-#: src/msgunfmt.c:428
+#: src/msgunfmt.c:440
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2627,12 +2616,12 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java 模式：產生 Java ResourceBundle class\n"
 
-#: src/msgunfmt.c:430
+#: src/msgunfmt.c:442
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：輸入檔是 .NET .dll 檔\n"
 
-#: src/msgunfmt.c:432
+#: src/msgunfmt.c:444
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2641,24 +2630,24 @@ msgstr ""
 "      --csharp-resources      C# resources 模式：輸入內容是 .NET .resources "
 "檔案\n"
 
-#: src/msgunfmt.c:434
+#: src/msgunfmt.c:446
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl 模式：輸入資料是 tcl/msgcat .msg 檔\n"
 
-#: src/msgunfmt.c:439
+#: src/msgunfmt.c:451
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  檔案 ...                    作為輸入的 .mo 檔\n"
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:450
+#: src/msgunfmt.c:462
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2668,41 +2657,41 @@ msgstr ""
 "class 名稱是由語言名稱和 resource 名稱合併來決定的，兩者之間會用底線分隔。\n"
 "class 檔會在 CLASSPATH 變數所指定的目錄中搜尋。\n"
 
-#: src/msgunfmt.c:455
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:463
+#: src/msgunfmt.c:475
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:479
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸入檔位置：\n"
 
-#: src/msgunfmt.c:473
+#: src/msgunfmt.c:485
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:493
+#: src/msgunfmt.c:511
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgunfmt.c:495
+#: src/msgunfmt.c:513
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                輸出結果嚴格遵從 Uniforum 格式\n"
 
-#: src/msguniq.c:318
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2722,12 +2711,12 @@ msgstr ""
 "則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
 "當使用 --unique 選項時，則會捨棄任何重複的翻譯條目。\n"
 
-#: src/msguniq.c:351
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只顯示重複條目\n"
 
-#: src/msguniq.c:353
+#: src/msguniq.c:365
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2735,7 +2724,7 @@ msgid ""
 msgstr ""
 "  -u, --unique                只顯示出現一次的條目，捨棄任何重複的條目\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<標準輸入>"
@@ -2819,65 +2808,65 @@ msgstr "第一個複數格式的索引數字不是 0"
 msgid "plural form has wrong index"
 msgstr "複數格式含有錯誤的索引數字"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "錯誤太多，必須中斷作業"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "無效的位元組序列"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "檔案末端出現不完整的位元組序列"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "行末出現不完整的位元組序列"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv 失敗"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "不明的關鍵字“%s”"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "無效的控制序列"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "檔案在字串中段突然結束"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "字串中間突然斷行"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "訊息被重複定義"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...這是第一次定義的位置"
@@ -2968,28 +2957,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "需要恰好兩個參數"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "用法：%s [選項] 網址 檔案\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr "擷取並輸出某網址的內容。如果無法存取該網址，則改用指定的本機檔案代替。\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "寫入至標準輸出時發生錯誤"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 #, fuzzy
 msgid ""
@@ -3029,42 +3033,42 @@ msgid ""
 "support them."
 msgstr "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "無法產生輸出檔 “%s”"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "標準輸出"
 
-#: src/write-csharp.c:688
+#: src/write-csharp.c:703
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "無法建立 “%s” 目錄"
 
-#: src/write-csharp.c:751
+#: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-csharp.c:753
+#: src/write-csharp.c:768
 #, fuzzy, c-format
 msgid "compilation of C# class failed"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-java.c:975
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "並非有效的 Java class 名稱：%s"
 
-#: src/write-java.c:1060
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
 
-#: src/write-java.c:1063
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3075,13 +3079,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "當開啟檔案 “%s” 來寫入內容時發生錯誤"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "國際化的訊息不應含有 ‘\\%c’ 這個轉義控制序列 (escape sequence)"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3094,7 +3098,7 @@ msgstr ""
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3116,8 +3120,8 @@ msgstr "翻譯檔含有複數型態的翻譯，但 Qt 的翻譯檔不能處理
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3138,14 +3142,14 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "將內容寫入至 %s 副進程時發生錯誤"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 #, fuzzy
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 C# 的翻譯檔不能處理複數型態\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3164,36 +3168,34 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:2020
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "%s%s 出現不屬於 ASCII 字元的字串。\n"
 "請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3202,7 +3204,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3211,7 +3213,7 @@ msgstr ""
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3220,7 +3222,7 @@ msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3229,12 +3231,12 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3243,32 +3245,32 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3277,57 +3279,56 @@ msgstr ""
 "不支援 “glade” 語言。%s 是需要 expat 軟體的，\n"
 "但這個版本編譯時沒有加入 expat 支援。\n"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF 之前找不到任何表示字串完結的標記 “%s”"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1043
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} 缺少了右邊的大括號"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\l”) 無效"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\u”) 無效"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1217
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\L”) 無效"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
 
-#: src/x-python.c:233
-#, fuzzy, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s%s 出現不屬於 ASCII 字元的字串。\n"
 "請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3337,7 +3338,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3347,7 +3348,7 @@ msgstr ""
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3357,7 +3358,7 @@ msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3367,7 +3368,7 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3377,27 +3378,27 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: 無效的字串定義"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 後缺少了數字"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 無效的字串表示式"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3405,27 +3406,27 @@ msgid ""
 msgstr ""
 "%s:%lu: 警告：$\"...\" 這種格式因為安全理由已經過時；請改用 eval_gettext"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關鍵字，xgettext 將無法運作"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:769
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：無法辨認檔案 ‘%s’ 的副檔名 ‘%s’；會假設是 C 格式來處理"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3433,23 +3434,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:847
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        輸出檔會存取在指定目錄\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言選擇：\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:854
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3468,19 +3469,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:862
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "預設的語言是由輸入檔的延伸檔名決定的。\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3489,39 +3490,42 @@ msgstr ""
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  不取出屬於 FILE.po 的訊息\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:879
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊選項：\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽取所有字串\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:889 src/xgettext.c:896
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3534,16 +3538,16 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
 "                              表示不使用預設的關鍵字)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:900
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3551,7 +3555,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3564,53 +3568,53 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C trigraph\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (只適用於 C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:919
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:923
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:965
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3618,68 +3622,85 @@ msgstr ""
 "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
 "專案\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:969
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:971
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  指定匯報 msgid 問題時的郵件地址\n"
 
-#: src/xgettext.c:911
+#: src/xgettext.c:973
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:976
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1782
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1985
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1989
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1994
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2103
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2104
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr "縱使表面上 %s 宣告了是 %s 格式字串，但實際上不是。原因為：%s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3688,7 +3709,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3698,27 +3719,27 @@ msgstr ""
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並非空白字串。\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2834
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "%2$s 的參數 %1$s 不明確"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3730,7 +3751,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
 "使用 --msgid-bugs-address 選項。\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3226
 #, c-format
 msgid "language `%s' unknown"
 msgstr "不明的語言 ‘%s’"
@@ -3739,6 +3760,30 @@ msgstr "不明的語言 ‘%s’"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s：選項不合法 -- %c\n"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle 失敗，錯誤碼為 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "功能尚未編寫。"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "無法和 %s 副進程建立非專用的 I/O"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "和 %s 副進程溝通時出現錯誤"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "由 %s 副進程讀入資料時出現錯誤"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s 副進程已終止，錯誤碼為 %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "標頭欄位‘%s’仍然是預設值\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "